Index: ash/shell.cc |
diff --git a/ash/shell.cc b/ash/shell.cc |
index 3a71803273545fd50519caae5c9526a5a8100600..f46884f5ca14900138810ac794cf666bfaccb6be 100644 |
--- a/ash/shell.cc |
+++ b/ash/shell.cc |
@@ -14,17 +14,9 @@ |
#include "ash/accelerators/magnifier_key_scroller.h" |
#include "ash/accelerators/spoken_feedback_toggler.h" |
#include "ash/app_list/app_list_delegate_impl.h" |
+#include "ash/ash_constants.h" |
#include "ash/aura/wm_shell_aura.h" |
#include "ash/autoclick/autoclick_controller.h" |
-#include "ash/common/ash_constants.h" |
-#include "ash/common/gpu_support.h" |
-#include "ash/common/keyboard/keyboard_ui.h" |
-#include "ash/common/login_status.h" |
-#include "ash/common/session/session_state_delegate.h" |
-#include "ash/common/shell_delegate.h" |
-#include "ash/common/wallpaper/wallpaper_delegate.h" |
-#include "ash/common/wm_shell.h" |
-#include "ash/common/wm_window.h" |
#include "ash/display/cursor_window_controller.h" |
#include "ash/display/display_color_manager_chromeos.h" |
#include "ash/display/display_configuration_controller.h" |
@@ -41,18 +33,23 @@ |
#include "ash/drag_drop/drag_drop_controller.h" |
#include "ash/first_run/first_run_helper_impl.h" |
#include "ash/frame/custom_frame_view_ash.h" |
+#include "ash/gpu_support.h" |
#include "ash/high_contrast/high_contrast_controller.h" |
#include "ash/ime/input_method_event_handler.h" |
+#include "ash/keyboard/keyboard_ui.h" |
#include "ash/laser/laser_pointer_controller.h" |
+#include "ash/login_status.h" |
#include "ash/magnifier/magnification_controller.h" |
#include "ash/magnifier/partial_magnification_controller.h" |
#include "ash/public/cpp/shell_window_ids.h" |
#include "ash/root_window_controller.h" |
+#include "ash/session/session_state_delegate.h" |
#include "ash/shelf/app_list_shelf_item_delegate.h" |
#include "ash/shelf/shelf_delegate.h" |
#include "ash/shelf/shelf_item_delegate.h" |
#include "ash/shelf/shelf_model.h" |
#include "ash/shelf/wm_shelf.h" |
+#include "ash/shell_delegate.h" |
#include "ash/shell_init_params.h" |
#include "ash/sticky_keys/sticky_keys_controller.h" |
#include "ash/system/bluetooth/bluetooth_notification_controller.h" |
@@ -66,6 +63,7 @@ |
#include "ash/touch/ash_touch_transform_controller.h" |
#include "ash/utility/screenshot_controller.h" |
#include "ash/virtual_keyboard_controller.h" |
+#include "ash/wallpaper/wallpaper_delegate.h" |
#include "ash/wm/ash_focus_rules.h" |
#include "ash/wm/ash_native_cursor_manager.h" |
#include "ash/wm/container_finder.h" |
@@ -91,6 +89,8 @@ |
#include "ash/wm/window_properties.h" |
#include "ash/wm/window_util.h" |
#include "ash/wm/workspace_controller.h" |
+#include "ash/wm_shell.h" |
+#include "ash/wm_window.h" |
#include "base/bind.h" |
#include "base/bind_helpers.h" |
#include "base/command_line.h" |