Index: ash/accelerators/accelerator_controller.cc |
diff --git a/ash/common/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc |
similarity index 97% |
rename from ash/common/accelerators/accelerator_controller.cc |
rename to ash/accelerators/accelerator_controller.cc |
index 0fdc14d409711e66ea337202aba96aca89e1959d..e93911ce84cd3123a748013654553167339c02de 100644 |
--- a/ash/common/accelerators/accelerator_controller.cc |
+++ b/ash/accelerators/accelerator_controller.cc |
@@ -2,35 +2,27 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "ash/common/accelerators/accelerator_controller.h" |
+#include "ash/accelerators/accelerator_controller.h" |
#include <utility> |
-#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_controller.h" |
-#include "ash/common/multi_profile_uma.h" |
-#include "ash/common/new_window_controller.h" |
-#include "ash/common/palette_delegate.h" |
-#include "ash/common/session/session_state_delegate.h" |
-#include "ash/common/shelf/shelf_widget.h" |
-#include "ash/common/shelf/wm_shelf.h" |
-#include "ash/common/shell_delegate.h" |
-#include "ash/common/wm/mru_window_tracker.h" |
-#include "ash/common/wm/overview/window_selector_controller.h" |
-#include "ash/common/wm/window_cycle_controller.h" |
-#include "ash/common/wm/window_positioning_utils.h" |
-#include "ash/common/wm/window_state.h" |
-#include "ash/common/wm/wm_event.h" |
-#include "ash/common/wm_shell.h" |
-#include "ash/common/wm_window.h" |
+#include "ash/accelerators/accelerator_commands.h" |
+#include "ash/accelerators/accelerator_controller_delegate.h" |
+#include "ash/accelerators/debug_commands.h" |
+#include "ash/accessibility_delegate.h" |
+#include "ash/accessibility_types.h" |
+#include "ash/focus_cycler.h" |
+#include "ash/ime_control_delegate.h" |
+#include "ash/media_controller.h" |
+#include "ash/multi_profile_uma.h" |
+#include "ash/new_window_controller.h" |
+#include "ash/palette_delegate.h" |
#include "ash/resources/vector_icons/vector_icons.h" |
#include "ash/root_window_controller.h" |
+#include "ash/session/session_state_delegate.h" |
+#include "ash/shelf/shelf_widget.h" |
+#include "ash/shelf/wm_shelf.h" |
+#include "ash/shell_delegate.h" |
#include "ash/strings/grit/ash_strings.h" |
#include "ash/system/brightness_control_delegate.h" |
#include "ash/system/ime_menu/ime_menu_tray.h" |
@@ -42,6 +34,14 @@ |
#include "ash/system/tray/system_tray_delegate.h" |
#include "ash/system/tray/system_tray_notifier.h" |
#include "ash/system/web_notification/web_notification_tray.h" |
+#include "ash/wm/mru_window_tracker.h" |
+#include "ash/wm/overview/window_selector_controller.h" |
+#include "ash/wm/window_cycle_controller.h" |
+#include "ash/wm/window_positioning_utils.h" |
+#include "ash/wm/window_state.h" |
+#include "ash/wm/wm_event.h" |
+#include "ash/wm_shell.h" |
+#include "ash/wm_window.h" |
#include "base/metrics/histogram_macros.h" |
#include "base/metrics/user_metrics.h" |
#include "chromeos/dbus/dbus_thread_manager.h" |