Revert "chromeos: Move files in //ash/common to //ash, part 3"

ash/common/wm_shell.cc

Index: ash/common/wm_shell.cc
diff --git a/ash/wm_shell.cc b/ash/common/wm_shell.cc
similarity index 95%
rename from ash/wm_shell.cc
rename to ash/common/wm_shell.cc
index a2bea2c121757fdb7c24d7b3613066d0f5cd21cb..6bbbe0b32f6f6c4dbe66bf13590ef6b5cf4fcd69 100644
--- a/ash/wm_shell.cc
+++ b/ash/common/wm_shell.cc
@@ -2,33 +2,37 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/wm_shell.h"
+#include "ash/common/wm_shell.h"
 
 #include <utility>
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/ash_focus_manager_factory.h"
-#include "ash/accessibility_delegate.h"
-#include "ash/cast_config_controller.h"
-#include "ash/devtools/ash_devtools_css_agent.h"
-#include "ash/devtools/ash_devtools_dom_agent.h"
-#include "ash/focus_cycler.h"
-#include "ash/keyboard/keyboard_ui.h"
-#include "ash/media_controller.h"
-#include "ash/new_window_controller.h"
-#include "ash/palette_delegate.h"
+#include "ash/common/accessibility_delegate.h"
+#include "ash/common/cast_config_controller.h"
+#include "ash/common/devtools/ash_devtools_css_agent.h"
+#include "ash/common/devtools/ash_devtools_dom_agent.h"
+#include "ash/common/focus_cycler.h"
+#include "ash/common/keyboard/keyboard_ui.h"
+#include "ash/common/media_controller.h"
+#include "ash/common/new_window_controller.h"
+#include "ash/common/palette_delegate.h"
+#include "ash/common/session/session_controller.h"
+#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shell_delegate.h"
+#include "ash/common/shutdown_controller.h"
+#include "ash/common/wallpaper/wallpaper_controller.h"
+#include "ash/common/wallpaper/wallpaper_delegate.h"
+#include "ash/common/wm_activation_observer.h"
+#include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
-#include "ash/session/session_controller.h"
-#include "ash/session/session_state_delegate.h"
 #include "ash/shelf/app_list_shelf_item_delegate.h"
 #include "ash/shelf/shelf_controller.h"
 #include "ash/shelf/shelf_delegate.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_window_watcher.h"
 #include "ash/shell.h"
-#include "ash/shell_delegate.h"
-#include "ash/shutdown_controller.h"
 #include "ash/system/brightness/brightness_controller_chromeos.h"
 #include "ash/system/brightness_control_delegate.h"
 #include "ash/system/keyboard_brightness_control_delegate.h"
@@ -40,8 +44,6 @@
 #include "ash/system/tray/system_tray_controller.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_notifier.h"
-#include "ash/wallpaper/wallpaper_controller.h"
-#include "ash/wallpaper/wallpaper_delegate.h"
 #include "ash/wm/immersive_context_ash.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/wm/mru_window_tracker.h"
@@ -49,8 +51,6 @@
 #include "ash/wm/root_window_finder.h"
 #include "ash/wm/system_modal_container_layout_manager.h"
 #include "ash/wm/window_cycle_controller.h"
-#include "ash/wm_activation_observer.h"
-#include "ash/wm_window.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"