Moves accelerator code using common types to ash/common

BUG=612331 TEST=none R=jamescook@chromium.org TBR=jamescook@chromium.org Review-Url: https://codereview.chromium.org/2166793005 Cr-Commit-Position: refs/heads/master@{#406877}
Denger-Network · Jul 21, 2016 · de61f98 · de61f98
1 parent e75bb44
commit de61f98
Show file tree

Hide file tree

Showing 45 changed files with 84 additions and 84 deletions.
diff --git a/ash/accelerators/accelerator_commands_unittest.cc b/ash/accelerators/accelerator_commands_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/accelerators/accelerator_commands.h"
+#include "ash/common/accelerators/accelerator_commands.h"
 
 #include <memory>
 

diff --git a/ash/accelerators/accelerator_controller_delegate_aura.cc b/ash/accelerators/accelerator_controller_delegate_aura.cc
@@ -10,7 +10,7 @@
 #include <utility>
 
 #include "ash/accelerators/accelerator_commands_aura.h"
-#include "ash/accelerators/debug_commands.h"
+#include "ash/common/accelerators/debug_commands.h"
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/accessibility_types.h"
 #include "ash/common/ash_switches.h"

diff --git a/ash/accelerators/accelerator_controller_delegate_aura.h b/ash/accelerators/accelerator_controller_delegate_aura.h
@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include "ash/accelerators/accelerator_controller_delegate.h"
+#include "ash/common/accelerators/accelerator_controller_delegate.h"
 #include "base/macros.h"
 
 namespace ash {

diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
@@ -2,12 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
 
-#include "ash/accelerators/accelerator_table.h"
 #include "ash/aura/wm_window_aura.h"
+#include "ash/common/accelerators/accelerator_table.h"
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/accessibility_types.h"
+#include "ash/common/ime_control_delegate.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/brightness_control_delegate.h"
@@ -20,7 +21,6 @@
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm_shell.h"
 #include "ash/display/display_manager.h"
-#include "ash/ime_control_delegate.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"

diff --git a/ash/accelerators/accelerator_delegate.cc b/ash/accelerators/accelerator_delegate.cc
@@ -4,7 +4,7 @@
 
 #include "ash/accelerators/accelerator_delegate.h"
 
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"

diff --git a/ash/accelerators/accelerator_filter_unittest.cc b/ash/accelerators/accelerator_filter_unittest.cc
@@ -6,8 +6,8 @@
 
 #include <memory>
 
-#include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_delegate.h"
+#include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"

diff --git a/ash/accelerators/accelerator_interactive_uitest_chromeos.cc b/ash/accelerators/accelerator_interactive_uitest_chromeos.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
 
 #include "ash/common/shell_observer.h"
 #include "ash/common/system/chromeos/network/network_observer.h"

diff --git a/ash/accelerators/focus_manager_factory.cc b/ash/accelerators/focus_manager_factory.cc
@@ -4,7 +4,7 @@
 
 #include "ash/accelerators/focus_manager_factory.h"
 
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/shell.h"
 #include "ui/views/focus/focus_manager.h"
 

diff --git a/ash/ash.gyp b/ash/ash.gyp
@@ -7,23 +7,12 @@
     'chromium_code': 1,
     # These files lists are shared with the GN build.
     'ash_sources': [
-      'accelerators/accelerator_commands.cc',
-      'accelerators/accelerator_commands.h',
       'accelerators/accelerator_commands_aura.cc',
       'accelerators/accelerator_commands_aura.h',
-      'accelerators/accelerator_controller.cc',
-      'accelerators/accelerator_controller.h',
-      'accelerators/accelerator_controller_delegate.h',
       'accelerators/accelerator_controller_delegate_aura.cc',
       'accelerators/accelerator_controller_delegate_aura.h',
       'accelerators/accelerator_delegate.cc',
       'accelerators/accelerator_delegate.h',
-      'accelerators/accelerator_table.cc',
-      'accelerators/accelerator_table.h',
-      'accelerators/debug_commands.cc',
-      'accelerators/debug_commands.h',
-      'accelerators/exit_warning_handler.cc',
-      'accelerators/exit_warning_handler.h',
       'accelerators/focus_manager_factory.cc',
       'accelerators/focus_manager_factory.h',
       'accelerators/key_hold_detector.cc',
@@ -55,6 +44,17 @@
       'autoclick/autoclick_controller.h',
       'cancel_mode.cc',
       'cancel_mode.h',
+      'common/accelerators/accelerator_commands.cc',
+      'common/accelerators/accelerator_commands.h',
+      'common/accelerators/accelerator_controller.cc',
+      'common/accelerators/accelerator_controller.h',
+      'common/accelerators/accelerator_controller_delegate.h',
+      'common/accelerators/accelerator_table.cc',
+      'common/accelerators/accelerator_table.h',
+      'common/accelerators/debug_commands.cc',
+      'common/accelerators/debug_commands.h',
+      'common/accelerators/exit_warning_handler.cc',
+      'common/accelerators/exit_warning_handler.h',
       'common/accessibility_delegate.h',
       'common/accessibility_types.h',
       'common/ash_constants.cc',
@@ -899,12 +899,12 @@
       'accelerators/accelerator_commands_unittest.cc',
       'accelerators/accelerator_controller_unittest.cc',
       'accelerators/accelerator_filter_unittest.cc',
-      'accelerators/accelerator_table_unittest.cc',
       'accelerators/magnifier_key_scroller_unittest.cc',
       'accelerators/spoken_feedback_toggler_unittest.cc',
       'app_list/app_list_presenter_delegate_unittest.cc',
       'ash_touch_exploration_manager_chromeos_unittest.cc',
       'autoclick/autoclick_unittest.cc',
+      'common/accelerators/accelerator_table_unittest.cc',
       'common/display/display_info_unittest.cc',
       'common/material_design/material_design_controller_unittest.cc',
       'common/popup_message_unittest.cc',

diff --git a/ash/accelerators/accelerator_commands.cc → ...mmon/accelerators/accelerator_commands.cc b/ash/accelerators/accelerator_commands.cc → ...mmon/accelerators/accelerator_commands.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/accelerators/accelerator_commands.h"
+#include "ash/common/accelerators/accelerator_commands.h"
 
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/window_state.h"

diff --git a/ash/accelerators/accelerator_commands.h → ...ommon/accelerators/accelerator_commands.h b/ash/accelerators/accelerator_commands.h → ...ommon/accelerators/accelerator_commands.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_ACCELERATORS_ACCELERATOR_COMMANDS_H_
-#define ASH_ACCELERATORS_ACCELERATOR_COMMANDS_H_
+#ifndef ASH_COMMON_ACCELERATORS_ACCELERATOR_COMMANDS_H_
+#define ASH_COMMON_ACCELERATORS_ACCELERATOR_COMMANDS_H_
 
 #include "ash/ash_export.h"
 
@@ -28,4 +28,4 @@ ASH_EXPORT void ToggleFullscreen();
 }  // namespace accelerators
 }  // namespace ash
 
-#endif  // ASH_ACCELERATORS_ACCELERATOR_COMMANDS_H_
+#endif  // ASH_COMMON_ACCELERATORS_ACCELERATOR_COMMANDS_H_
diff --git a/ash/accelerators/accelerator_controller.cc → ...on/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc → ...on/accelerators/accelerator_controller.cc
@@ -2,14 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
 
-#include "ash/accelerators/accelerator_commands.h"
-#include "ash/accelerators/accelerator_controller_delegate.h"
-#include "ash/accelerators/debug_commands.h"
+#include "ash/common/accelerators/accelerator_commands.h"
+#include "ash/common/accelerators/accelerator_controller_delegate.h"
+#include "ash/common/accelerators/debug_commands.h"
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/accessibility_types.h"
 #include "ash/common/focus_cycler.h"
+#include "ash/common/ime_control_delegate.h"
 #include "ash/common/media_delegate.h"
 #include "ash/common/multi_profile_uma.h"
 #include "ash/common/session/session_state_delegate.h"
@@ -27,7 +28,6 @@
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
-#include "ash/ime_control_delegate.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics.h"
 #include "ui/base/accelerators/accelerator.h"

diff --git a/ash/accelerators/accelerator_controller.h → ...mon/accelerators/accelerator_controller.h b/ash/accelerators/accelerator_controller.h → ...mon/accelerators/accelerator_controller.h
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
-#define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
+#ifndef ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
+#define ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
 
 #include <stddef.h>
 
 #include <map>
 #include <memory>
 #include <set>
 
-#include "ash/accelerators/accelerator_table.h"
-#include "ash/accelerators/exit_warning_handler.h"
 #include "ash/ash_export.h"
+#include "ash/common/accelerators/accelerator_table.h"
+#include "ash/common/accelerators/exit_warning_handler.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
@@ -200,4 +200,4 @@ class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget {
 
 }  // namespace ash
 
-#endif  // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
+#endif  // ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
diff --git a/...erators/accelerator_controller_delegate.h → ...erators/accelerator_controller_delegate.h b/...erators/accelerator_controller_delegate.h → ...erators/accelerator_controller_delegate.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
-#define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
+#ifndef ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
+#define ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
 
-#include "ash/accelerators/accelerator_table.h"
 #include "ash/ash_export.h"
+#include "ash/common/accelerators/accelerator_table.h"
 
 namespace ui {
 class Accelerator;
@@ -47,4 +47,4 @@ class ASH_EXPORT AcceleratorControllerDelegate {
 
 }  // namespace ash
 
-#endif  // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
+#endif  // ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
diff --git a/ash/accelerators/accelerator_table.cc → ash/common/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc → ash/common/accelerators/accelerator_table.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/accelerators/accelerator_table.h"
+#include "ash/common/accelerators/accelerator_table.h"
 
 #include "ash/common/strings/grit/ash_strings.h"
 #include "base/macros.h"

diff --git a/ash/accelerators/accelerator_table.h → ash/common/accelerators/accelerator_table.h b/ash/accelerators/accelerator_table.h → ash/common/accelerators/accelerator_table.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
-#define ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
+#ifndef ASH_COMMON_ACCELERATORS_ACCELERATOR_TABLE_H_
+#define ASH_COMMON_ACCELERATORS_ACCELERATOR_TABLE_H_
 
 #include <stddef.h>
 
@@ -258,4 +258,4 @@ ASH_EXPORT extern const size_t kActionsKeepingMenuOpenLength;
 
 }  // namespace ash
 
-#endif  // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
+#endif  // ASH_COMMON_ACCELERATORS_ACCELERATOR_TABLE_H_
diff --git a/...ccelerators/accelerator_table_unittest.cc → ...ccelerators/accelerator_table_unittest.cc b/...ccelerators/accelerator_table_unittest.cc → ...ccelerators/accelerator_table_unittest.cc
@@ -4,7 +4,7 @@
 
 #include <set>
 
-#include "ash/accelerators/accelerator_table.h"
+#include "ash/common/accelerators/accelerator_table.h"
 #include "base/strings/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

diff --git a/ash/accelerators/debug_commands.cc → ash/common/accelerators/debug_commands.cc b/ash/accelerators/debug_commands.cc → ash/common/accelerators/debug_commands.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/accelerators/debug_commands.h"
+#include "ash/common/accelerators/debug_commands.h"
 
-#include "ash/accelerators/accelerator_commands.h"
+#include "ash/common/accelerators/accelerator_commands.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/system/toast/toast_data.h"

diff --git a/ash/accelerators/debug_commands.h → ash/common/accelerators/debug_commands.h b/ash/accelerators/debug_commands.h → ash/common/accelerators/debug_commands.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_ACCELERATORS_DEBUG_COMMANDS_H_
-#define ASH_ACCELERATORS_DEBUG_COMMANDS_H_
+#ifndef ASH_COMMON_ACCELERATORS_DEBUG_COMMANDS_H_
+#define ASH_COMMON_ACCELERATORS_DEBUG_COMMANDS_H_
 
-#include "ash/accelerators/accelerator_table.h"
 #include "ash/ash_export.h"
+#include "ash/common/accelerators/accelerator_table.h"
 
 // This file contains implementations of commands that are used only when
 // debugging.
@@ -30,4 +30,4 @@ ASH_EXPORT void PerformDebugActionIfEnabled(AcceleratorAction action);
 }  // namespace debug
 }  // namespace ash
 
-#endif  // ASH_ACCELERATORS_DEBUG_COMMANDS_H_
+#endif  // ASH_COMMON_ACCELERATORS_DEBUG_COMMANDS_H_
diff --git a/ash/accelerators/exit_warning_handler.cc → ...mmon/accelerators/exit_warning_handler.cc b/ash/accelerators/exit_warning_handler.cc → ...mmon/accelerators/exit_warning_handler.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/accelerators/exit_warning_handler.h"
+#include "ash/common/accelerators/exit_warning_handler.h"
 
 #include "ash/common/shell_delegate.h"
 #include "ash/common/shell_window_ids.h"

diff --git a/ash/accelerators/exit_warning_handler.h → ...ommon/accelerators/exit_warning_handler.h b/ash/accelerators/exit_warning_handler.h → ...ommon/accelerators/exit_warning_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_ACCELERATORS_EXIT_WARNING_HANDLER_H_
-#define ASH_ACCELERATORS_EXIT_WARNING_HANDLER_H_
+#ifndef ASH_COMMON_ACCELERATORS_EXIT_WARNING_HANDLER_H_
+#define ASH_COMMON_ACCELERATORS_EXIT_WARNING_HANDLER_H_
 
 #include <memory>
 
@@ -81,4 +81,4 @@ class ASH_EXPORT ExitWarningHandler {
 
 }  // namespace ash
 
-#endif  // ASH_ACCELERATORS_EXIT_WARNING_HANDLER_H_
+#endif  // ASH_COMMON_ACCELERATORS_EXIT_WARNING_HANDLER_H_
diff --git a/ash/ime_control_delegate.h → ash/common/ime_control_delegate.h b/ash/ime_control_delegate.h → ash/common/ime_control_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_IME_CONTROL_DELEGATE_H_
-#define ASH_IME_CONTROL_DELEGATE_H_
+#ifndef ASH_COMMON_IME_CONTROL_DELEGATE_H_
+#define ASH_COMMON_IME_CONTROL_DELEGATE_H_
 
 namespace ui {
 class Accelerator;
@@ -37,4 +37,4 @@ class ImeControlDelegate {
 
 }  // namespace ash
 
-#endif  // ASH_IME_CONTROL_DELEGATE_H_
+#endif  // ASH_COMMON_IME_CONTROL_DELEGATE_H_
diff --git a/ash/content/keyboard_overlay/keyboard_overlay_view_unittest.cc b/ash/content/keyboard_overlay/keyboard_overlay_view_unittest.cc
@@ -6,7 +6,7 @@
 
 #include <algorithm>
 
-#include "ash/accelerators/accelerator_table.h"
+#include "ash/common/accelerators/accelerator_table.h"
 #include "ash/content/keyboard_overlay/keyboard_overlay_delegate.h"
 #include "ash/content/shell_content_state.h"
 #include "ash/test/ash_test_base.h"

diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc
@@ -7,7 +7,7 @@
 #include <memory>
 #include <utility>
 
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/system/tray/system_tray_delegate.h"

diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc
@@ -10,8 +10,8 @@
 #include <string>
 #include <vector>
 
-#include "ash/accelerators/accelerator_commands.h"
 #include "ash/aura/wm_window_aura.h"
+#include "ash/common/accelerators/accelerator_commands.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"

diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc
@@ -4,9 +4,9 @@
 
 #include "ash/shelf/shelf_layout_manager.h"
 
-#include "ash/accelerators/accelerator_controller.h"
-#include "ash/accelerators/accelerator_table.h"
 #include "ash/aura/wm_window_aura.h"
+#include "ash/common/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_table.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/focus_cycler.h"
 #include "ash/common/material_design/material_design_controller.h"