Index: ash/root_window_controller.cc |
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc |
index 570874640c5ef2ae12a647249345904514ce85a5..c3387a10d33e2674370742cc87df0f48f494339a 100644 |
--- a/ash/root_window_controller.cc |
+++ b/ash/root_window_controller.cc |
@@ -8,56 +8,56 @@ |
#include <queue> |
#include <vector> |
+#include "ash/ash_constants.h" |
+#include "ash/ash_switches.h" |
#include "ash/ash_touch_exploration_manager_chromeos.h" |
#include "ash/aura/aura_layout_manager_adapter.h" |
-#include "ash/common/ash_constants.h" |
-#include "ash/common/ash_switches.h" |
-#include "ash/common/focus_cycler.h" |
-#include "ash/common/login_status.h" |
-#include "ash/common/session/session_state_delegate.h" |
-#include "ash/common/shelf/shelf_delegate.h" |
-#include "ash/common/shelf/shelf_layout_manager.h" |
-#include "ash/common/shelf/shelf_widget.h" |
-#include "ash/common/shelf/wm_shelf.h" |
-#include "ash/common/shell_delegate.h" |
-#include "ash/common/wallpaper/wallpaper_delegate.h" |
-#include "ash/common/wallpaper/wallpaper_widget_controller.h" |
-#include "ash/common/wm/always_on_top_controller.h" |
-#include "ash/common/wm/container_finder.h" |
-#include "ash/common/wm/dock/docked_window_layout_manager.h" |
-#include "ash/common/wm/fullscreen_window_finder.h" |
-#include "ash/common/wm/lock_layout_manager.h" |
-#include "ash/common/wm/panels/panel_layout_manager.h" |
-#include "ash/common/wm/root_window_layout_manager.h" |
-#include "ash/common/wm/switchable_windows.h" |
-#include "ash/common/wm/system_modal_container_layout_manager.h" |
-#include "ash/common/wm/window_state.h" |
-#include "ash/common/wm/wm_screen_util.h" |
-#include "ash/common/wm/workspace/workspace_layout_manager.h" |
-#include "ash/common/wm/workspace_controller.h" |
-#include "ash/common/wm_shell.h" |
-#include "ash/common/wm_window.h" |
+#include "ash/focus_cycler.h" |
#include "ash/high_contrast/high_contrast_controller.h" |
#include "ash/host/ash_window_tree_host.h" |
+#include "ash/login_status.h" |
#include "ash/public/cpp/shelf_types.h" |
#include "ash/public/cpp/shell_window_ids.h" |
#include "ash/root_window_settings.h" |
+#include "ash/session/session_state_delegate.h" |
+#include "ash/shelf/shelf_delegate.h" |
+#include "ash/shelf/shelf_layout_manager.h" |
+#include "ash/shelf/shelf_widget.h" |
#include "ash/shelf/shelf_window_targeter.h" |
+#include "ash/shelf/wm_shelf.h" |
#include "ash/shell.h" |
+#include "ash/shell_delegate.h" |
#include "ash/system/status_area_layout_manager.h" |
#include "ash/system/status_area_widget.h" |
#include "ash/system/tray/system_tray_delegate.h" |
#include "ash/touch/touch_hud_debug.h" |
#include "ash/touch/touch_hud_projection.h" |
#include "ash/touch/touch_observer_hud.h" |
+#include "ash/wallpaper/wallpaper_delegate.h" |
+#include "ash/wallpaper/wallpaper_widget_controller.h" |
+#include "ash/wm/always_on_top_controller.h" |
#include "ash/wm/boot_splash_screen_chromeos.h" |
+#include "ash/wm/container_finder.h" |
+#include "ash/wm/dock/docked_window_layout_manager.h" |
+#include "ash/wm/fullscreen_window_finder.h" |
+#include "ash/wm/lock_layout_manager.h" |
#include "ash/wm/panels/attached_panel_window_targeter.h" |
+#include "ash/wm/panels/panel_layout_manager.h" |
#include "ash/wm/panels/panel_window_event_handler.h" |
+#include "ash/wm/root_window_layout_manager.h" |
#include "ash/wm/stacking_controller.h" |
+#include "ash/wm/switchable_windows.h" |
+#include "ash/wm/system_modal_container_layout_manager.h" |
#include "ash/wm/system_wallpaper_controller.h" |
#include "ash/wm/window_properties.h" |
+#include "ash/wm/window_state.h" |
#include "ash/wm/window_state_aura.h" |
#include "ash/wm/window_util.h" |
+#include "ash/wm/wm_screen_util.h" |
+#include "ash/wm/workspace/workspace_layout_manager.h" |
+#include "ash/wm/workspace_controller.h" |
+#include "ash/wm_shell.h" |
+#include "ash/wm_window.h" |
#include "base/command_line.h" |
#include "base/macros.h" |
#include "base/memory/ptr_util.h" |