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

Now that mustash can use standard aura windows we don't need the ash/aura vs. ash/mus vs. ash/common distinction. Eliminate //ash/common. Also move files in //ash/common/system/chromeos out to //ash/system because ash only compiles on chromeos these days. Part 3 the rest of //ash/common into //ash. The CQ cannot move all the files at once, see https://codereview.chromium.org/2734653002/ BUG=690096 TEST=compiles, ash_unittests TBR=oshima@chromium.org CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation Review-Url: https://codereview.chromium.org/2729363002 Cr-Commit-Position: refs/heads/master@{#454793}
marcosholgado · Mar 5, 2017 · 654b40d · 654b40d
1 parent ab5da80
commit 654b40d
Show file tree

Hide file tree

Showing 650 changed files with 1,363 additions and 1,383 deletions.
diff --git a/WATCHLISTS b/WATCHLISTS
@@ -1120,7 +1120,7 @@
       'filepath': 'ui/keyboard/'\
                   '|chrome/test/data/chromeos/virtual_keyboard/'\
                   '|extensions/browser/api/virtual_keyboard_private/'\
-                  '|ash/common/system/chromeos/virtual_keyboard/'\
+                  '|ash/system/virtual_keyboard/'\
                   '|ash/virtual_keyboard',
     },
     'virtual_reality': {

diff --git a/ash/BUILD.gn b/ash/BUILD.gn
@@ -42,14 +42,22 @@ component("ash") {
     "accelerators/magnifier_key_scroller.h",
     "accelerators/spoken_feedback_toggler.cc",
     "accelerators/spoken_feedback_toggler.h",
+    "accessibility_delegate.h",
+    "accessibility_types.h",
     "animation/animation_change_type.h",
     "app_list/app_list_delegate_impl.cc",
     "app_list/app_list_delegate_impl.h",
     "app_list/app_list_presenter_delegate.cc",
     "app_list/app_list_presenter_delegate.h",
     "app_list/app_list_presenter_delegate_factory.cc",
     "app_list/app_list_presenter_delegate_factory.h",
+    "ash_constants.cc",
+    "ash_constants.h",
     "ash_export.h",
+    "ash_layout_constants.cc",
+    "ash_layout_constants.h",
+    "ash_switches.cc",
+    "ash_switches.h",
     "ash_touch_exploration_manager_chromeos.cc",
     "ash_touch_exploration_manager_chromeos.h",
     "aura/aura_layout_manager_adapter.cc",
@@ -64,76 +72,18 @@ component("ash") {
     "autoclick/autoclick_controller.h",
     "cancel_mode.cc",
     "cancel_mode.h",
-    "common/accessibility_delegate.h",
-    "common/accessibility_types.h",
-    "common/ash_constants.cc",
-    "common/ash_constants.h",
-    "common/ash_layout_constants.cc",
-    "common/ash_layout_constants.h",
-    "common/ash_switches.cc",
-    "common/ash_switches.h",
-    "common/cast_config_controller.cc",
-    "common/cast_config_controller.h",
-    "common/default_accessibility_delegate.cc",
-    "common/default_accessibility_delegate.h",
-    "common/devtools/ash_devtools_css_agent.cc",
-    "common/devtools/ash_devtools_css_agent.h",
-    "common/devtools/ash_devtools_dom_agent.cc",
-    "common/devtools/ash_devtools_dom_agent.h",
-    "common/focus_cycler.cc",
-    "common/focus_cycler.h",
-    "common/gpu_support.h",
-    "common/gpu_support_stub.cc",
-    "common/gpu_support_stub.h",
-    "common/key_event_watcher.cc",
-    "common/key_event_watcher.h",
-    "common/keyboard/keyboard_ui.cc",
-    "common/keyboard/keyboard_ui.h",
-    "common/keyboard/keyboard_ui_observer.h",
-    "common/login_status.h",
-    "common/material_design/material_design_controller.cc",
-    "common/material_design/material_design_controller.h",
-    "common/media_controller.cc",
-    "common/media_controller.h",
-    "common/mojo_interface_factory.cc",
-    "common/mojo_interface_factory.h",
-    "common/multi_profile_uma.cc",
-    "common/multi_profile_uma.h",
-    "common/new_window_controller.cc",
-    "common/new_window_controller.h",
-    "common/palette_delegate.h",
-    "common/scoped_root_window_for_new_windows.cc",
-    "common/scoped_root_window_for_new_windows.h",
-    "common/session/session_controller.cc",
-    "common/session/session_controller.h",
-    "common/session/session_state_delegate.cc",
-    "common/session/session_state_delegate.h",
-    "common/session/session_state_observer.cc",
-    "common/session/session_state_observer.h",
-    "common/shell_delegate.h",
-    "common/shutdown_controller.cc",
-    "common/shutdown_controller.h",
-    "common/wallpaper/wallpaper_controller.cc",
-    "common/wallpaper/wallpaper_controller.h",
-    "common/wallpaper/wallpaper_controller_observer.h",
-    "common/wallpaper/wallpaper_delegate.h",
-    "common/wallpaper/wallpaper_view.cc",
-    "common/wallpaper/wallpaper_view.h",
-    "common/wallpaper/wallpaper_widget_controller.cc",
-    "common/wallpaper/wallpaper_widget_controller.h",
-    "common/wm_activation_observer.h",
-    "common/wm_display_observer.h",
-    "common/wm_layout_manager.h",
-    "common/wm_shell.cc",
-    "common/wm_shell.h",
-    "common/wm_transient_window_observer.h",
-    "common/wm_window.cc",
-    "common/wm_window.h",
-    "common/wm_window_user_data.h",
+    "cast_config_controller.cc",
+    "cast_config_controller.h",
     "debug.cc",
     "debug.h",
+    "default_accessibility_delegate.cc",
+    "default_accessibility_delegate.h",
     "default_wallpaper_delegate.cc",
     "default_wallpaper_delegate.h",
+    "devtools/ash_devtools_css_agent.cc",
+    "devtools/ash_devtools_css_agent.h",
+    "devtools/ash_devtools_dom_agent.cc",
+    "devtools/ash_devtools_dom_agent.h",
     "display/cursor_window_controller.cc",
     "display/cursor_window_controller.h",
     "display/display_animator.h",
@@ -193,6 +143,8 @@ component("ash") {
     "first_run/first_run_helper.h",
     "first_run/first_run_helper_impl.cc",
     "first_run/first_run_helper_impl.h",
+    "focus_cycler.cc",
+    "focus_cycler.h",
     "frame/caption_buttons/caption_button_types.h",
     "frame/caption_buttons/frame_caption_button.cc",
     "frame/caption_buttons/frame_caption_button.h",
@@ -212,6 +164,9 @@ component("ash") {
     "frame/header_painter_util.h",
     "frame/header_view.cc",
     "frame/header_view.h",
+    "gpu_support.h",
+    "gpu_support_stub.cc",
+    "gpu_support_stub.h",
     "high_contrast/high_contrast_controller.cc",
     "high_contrast/high_contrast_controller.h",
     "host/ash_window_tree_host.cc",
@@ -228,6 +183,11 @@ component("ash") {
     "host/transformer_helper.h",
     "ime/input_method_event_handler.cc",
     "ime/input_method_event_handler.h",
+    "key_event_watcher.cc",
+    "key_event_watcher.h",
+    "keyboard/keyboard_ui.cc",
+    "keyboard/keyboard_ui.h",
+    "keyboard/keyboard_ui_observer.h",
     "laser/laser_pointer_controller.cc",
     "laser/laser_pointer_controller.h",
     "laser/laser_pointer_points.cc",
@@ -240,10 +200,15 @@ component("ash") {
     "link_handler_model.h",
     "link_handler_model_factory.cc",
     "link_handler_model_factory.h",
+    "login_status.h",
     "magnifier/magnification_controller.cc",
     "magnifier/magnification_controller.h",
     "magnifier/partial_magnification_controller.cc",
     "magnifier/partial_magnification_controller.h",
+    "material_design/material_design_controller.cc",
+    "material_design/material_design_controller.h",
+    "media_controller.cc",
+    "media_controller.h",
     "metrics/desktop_task_switch_metric_recorder.cc",
     "metrics/desktop_task_switch_metric_recorder.h",
     "metrics/gesture_action_type.h",
@@ -256,6 +221,13 @@ component("ash") {
     "metrics/user_metrics_action.h",
     "metrics/user_metrics_recorder.cc",
     "metrics/user_metrics_recorder.h",
+    "mojo_interface_factory.cc",
+    "mojo_interface_factory.h",
+    "multi_profile_uma.cc",
+    "multi_profile_uma.h",
+    "new_window_controller.cc",
+    "new_window_controller.h",
+    "palette_delegate.h",
     "root_window_controller.cc",
     "root_window_controller.h",
     "root_window_settings.cc",
@@ -266,9 +238,17 @@ component("ash") {
     "rotator/screen_rotation_animator.h",
     "rotator/window_rotation.cc",
     "rotator/window_rotation.h",
+    "scoped_root_window_for_new_windows.cc",
+    "scoped_root_window_for_new_windows.h",
     "screen_util.cc",
     "screen_util.h",
     "screenshot_delegate.h",
+    "session/session_controller.cc",
+    "session/session_controller.h",
+    "session/session_state_delegate.cc",
+    "session/session_state_delegate.h",
+    "session/session_state_observer.cc",
+    "session/session_state_observer.h",
     "shared/immersive_context.cc",
     "shared/immersive_context.h",
     "shared/immersive_focus_watcher.h",
@@ -340,7 +320,10 @@ component("ash") {
     "shelf/wm_shelf_util.h",
     "shell.cc",
     "shell.h",
+    "shell_delegate.h",
     "shell_init_params.h",
+    "shutdown_controller.cc",
+    "shutdown_controller.h",
     "sticky_keys/sticky_keys_controller.cc",
     "sticky_keys/sticky_keys_controller.h",
     "sticky_keys/sticky_keys_overlay.cc",
@@ -625,6 +608,14 @@ component("ash") {
     "utility/screenshot_controller.h",
     "virtual_keyboard_controller.cc",
     "virtual_keyboard_controller.h",
+    "wallpaper/wallpaper_controller.cc",
+    "wallpaper/wallpaper_controller.h",
+    "wallpaper/wallpaper_controller_observer.h",
+    "wallpaper/wallpaper_delegate.h",
+    "wallpaper/wallpaper_view.cc",
+    "wallpaper/wallpaper_view.h",
+    "wallpaper/wallpaper_widget_controller.cc",
+    "wallpaper/wallpaper_widget_controller.h",
     "wm/always_on_top_controller.cc",
     "wm/always_on_top_controller.h",
     "wm/ash_focus_rules.cc",
@@ -830,6 +821,15 @@ component("ash") {
     "wm/workspace/workspace_window_resizer.h",
     "wm/workspace_controller.cc",
     "wm/workspace_controller.h",
+    "wm_activation_observer.h",
+    "wm_display_observer.h",
+    "wm_layout_manager.h",
+    "wm_shell.cc",
+    "wm_shell.h",
+    "wm_transient_window_observer.h",
+    "wm_window.cc",
+    "wm_window.h",
+    "wm_window_user_data.h",
   ]
 
   configs += [ "//build/config:precompiled_headers" ]
@@ -1157,12 +1157,7 @@ source_set("common_unittests") {
     "accelerators/spoken_feedback_toggler_unittest.cc",
     "ash_touch_exploration_manager_chromeos_unittest.cc",
     "autoclick/autoclick_unittest.cc",
-    "common/devtools/ash_devtools_unittest.cc",
-    "common/mus_property_mirror_ash_unittest.cc",
-    "common/session/session_controller_unittest.cc",
-    "common/wallpaper/wallpaper_controller_unittest.cc",
-    "common/wm_window_unittest.cc",
-    "common/wm_window_user_data_unittest.cc",
+    "devtools/ash_devtools_unittest.cc",
     "drag_drop/drag_image_view_unittest.cc",
     "first_run/first_run_helper_unittest.cc",
     "focus_cycler_unittest.cc",
@@ -1178,9 +1173,11 @@ source_set("common_unittests") {
     "metrics/task_switch_metrics_recorder_unittest.cc",
     "metrics/task_switch_time_tracker_unittest.cc",
     "metrics/user_metrics_recorder_unittest.cc",
+    "mus_property_mirror_ash_unittest.cc",
     "root_window_controller_unittest.cc",
     "rotator/screen_rotation_animation_unittest.cc",
     "screen_util_unittest.cc",
+    "session/session_controller_unittest.cc",
     "shelf/shelf_application_menu_model_unittest.cc",
     "shelf/shelf_background_animator_unittest.cc",
     "shelf/shelf_button_pressed_metric_tracker_unittest.cc",
@@ -1232,6 +1229,7 @@ source_set("common_unittests") {
     "system/web_notification/web_notification_tray_unittest.cc",
     "test/ash_test_helper_unittest.cc",
     "tooltips/tooltip_controller_unittest.cc",
+    "wallpaper/wallpaper_controller_unittest.cc",
     "wm/ash_focus_rules_unittest.cc",
     "wm/container_finder_unittest.cc",
     "wm/dock/docked_window_layout_manager_unittest.cc",
@@ -1243,6 +1241,8 @@ source_set("common_unittests") {
     "wm/mru_window_tracker_unittest.cc",
     "wm/overview/cleanup_animation_observer_unittest.cc",
     "wm/workspace/workspace_layout_manager_unittest.cc",
+    "wm_window_unittest.cc",
+    "wm_window_user_data_unittest.cc",
   ]
   deps = [
     "//ash",

diff --git a/ash/DEPS b/ash/DEPS
@@ -1,14 +1,17 @@
 include_rules = [
   "+device/bluetooth",
   "+cc/debug",
+  "+components/prefs",
   "+components/quirks",
   "+components/session_manager",
   "+components/signin/core/account_id",
+  "+components/ui_devtools",
   "+components/user_manager",
   "+components/wallpaper",
   "+gpu/config",
   "+media",
   "+mojo/public",
+  "+services/preferences/public",
   "+services/service_manager/public",
   "+services/ui/public",
   "+skia/ext",

diff --git a/ash/README.md b/ash/README.md
@@ -1,8 +1,8 @@
-Mus+ash
+Ash
 ----------
-Ash is transitioning from using aura to using mus. During the
-transition period ash has support for both aura and mus. In order to
-work with both toolkits ash has a porting layer. This layer exists in
-ash/common. As portions of ash are converted to the porting layer they
-should move to ash/common. DEPS files may also be used to ensure new
-dependencies do not get added.
+Ash is the "aura shell", the window manager and system UI for Chrome
+OS.
+
+The mustash project is migrating ash to work with both traditional
+aura ("classic ash") and the mojo UI service ("mus"). Support for
+the differences are in ash/aura and ash/mus.
diff --git a/ash/accelerators/accelerator_commands.cc b/ash/accelerators/accelerator_commands.cc
@@ -4,11 +4,11 @@
 
 #include "ash/accelerators/accelerator_commands.h"
 
-#include "ash/common/wm_shell.h"
-#include "ash/common/wm_window.h"
 #include "ash/wm/mru_window_tracker.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/user_metrics.h"
 
 namespace ash {

diff --git a/ash/accelerators/accelerator_commands_aura.cc b/ash/accelerators/accelerator_commands_aura.cc
@@ -4,10 +4,10 @@
 
 #include "ash/accelerators/accelerator_commands_aura.h"
 
-#include "ash/common/wm_window.h"
 #include "ash/shell.h"
 #include "ash/wm/screen_pinning_controller.h"
 #include "ash/wm/window_state.h"
+#include "ash/wm_window.h"
 #include "base/metrics/user_metrics.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/manager/managed_display_info.h"

diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
@@ -9,22 +9,20 @@
 #include "ash/accelerators/accelerator_commands.h"
 #include "ash/accelerators/accelerator_controller_delegate.h"
 #include "ash/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/shell_delegate.h"
-#include "ash/common/wm_shell.h"
-#include "ash/common/wm_window.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 +40,8 @@
 #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"