diff --git a/DEPS b/DEPS index ca7c022..62fc8015 100644 --- a/DEPS +++ b/DEPS
@@ -40,11 +40,11 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and whatever else without interference from each other. - 'skia_revision': 'b733320ab13ff591777d3bce739494c29a30968b', + 'skia_revision': 'fc75b5afdef9bf896e20de9e88ca99f336616559', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other. - 'v8_revision': 'c9b4087f4a00632b7133c491addac7272d45cbef', + 'v8_revision': '221dcbfda527fb00b0e986bce6628e9cacd8d0d0', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling swarming_client # and whatever else without interference from each other.
diff --git a/WATCHLISTS b/WATCHLISTS index 0b141fe..7ccf843f 100644 --- 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 index e385c47..88736fa 100644 --- a/ash/BUILD.gn +++ b/ash/BUILD.gn
@@ -42,6 +42,8 @@ "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", @@ -49,7 +51,13 @@ "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 @@ "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 @@ "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 @@ "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 @@ "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 @@ "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 @@ "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 @@ "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 @@ "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 @@ "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 @@ "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 @@ "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 @@ "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 @@ "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 @@ "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 index 6fb9784c..02f6b464 100644 --- 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 index b5424c6d..8d74414 100644 --- 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 index 7c34110..1ae7b6c 100644 --- 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 index e78f996..2cde70d8 100644 --- 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 index 21eda7d2..e93911c 100644 --- 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"
diff --git a/ash/accelerators/accelerator_controller_delegate_aura.cc b/ash/accelerators/accelerator_controller_delegate_aura.cc index 9fddcad..db6fd67a7 100644 --- a/ash/accelerators/accelerator_controller_delegate_aura.cc +++ b/ash/accelerators/accelerator_controller_delegate_aura.cc
@@ -11,10 +11,7 @@ #include "ash/accelerators/accelerator_commands_aura.h" #include "ash/accelerators/debug_commands.h" -#include "ash/common/accessibility_types.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/shell_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/accessibility_types.h" #include "ash/debug.h" #include "ash/display/display_configuration_controller.h" #include "ash/display/window_tree_host_manager.h" @@ -24,8 +21,10 @@ #include "ash/root_window_controller.h" #include "ash/rotator/window_rotation.h" #include "ash/screenshot_delegate.h" +#include "ash/session/session_state_delegate.h" #include "ash/shelf/wm_shelf.h" #include "ash/shell.h" +#include "ash/shell_delegate.h" #include "ash/system/system_notifier.h" #include "ash/system/tray/system_tray.h" #include "ash/touch/touch_hud_debug.h" @@ -36,6 +35,7 @@ #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "ash/wm/wm_event.h" +#include "ash/wm_shell.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h"
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc index c8b88b7c..9772b3f 100644 --- a/ash/accelerators/accelerator_controller_unittest.cc +++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -5,14 +5,12 @@ #include "ash/accelerators/accelerator_controller.h" #include "ash/accelerators/accelerator_table.h" -#include "ash/common/accessibility_delegate.h" -#include "ash/common/accessibility_types.h" -#include "ash/common/ash_switches.h" -#include "ash/common/ime_control_delegate.h" -#include "ash/common/session/session_state_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/ash_switches.h" +#include "ash/ime_control_delegate.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/session/session_state_delegate.h" #include "ash/shell.h" #include "ash/system/brightness_control_delegate.h" #include "ash/system/keyboard_brightness_control_delegate.h" @@ -29,6 +27,8 @@ #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "ash/wm/wm_event.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "base/test/user_action_tester.cc" #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
diff --git a/ash/accelerators/accelerator_delegate.cc b/ash/accelerators/accelerator_delegate.cc index 3a87b0e..d2c252fb 100644 --- a/ash/accelerators/accelerator_delegate.cc +++ b/ash/accelerators/accelerator_delegate.cc
@@ -5,7 +5,7 @@ #include "ash/accelerators/accelerator_delegate.h" #include "ash/accelerators/accelerator_router.h" -#include "ash/common/wm_window.h" +#include "ash/wm_window.h" #include "ui/aura/window.h" #include "ui/events/event.h"
diff --git a/ash/accelerators/accelerator_filter_unittest.cc b/ash/accelerators/accelerator_filter_unittest.cc index 2b1b55da..0d821d2 100644 --- a/ash/accelerators/accelerator_filter_unittest.cc +++ b/ash/accelerators/accelerator_filter_unittest.cc
@@ -8,7 +8,6 @@ #include "ash/accelerators/accelerator_controller.h" #include "ash/accelerators/accelerator_delegate.h" -#include "ash/common/wm_shell.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" @@ -18,6 +17,7 @@ #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/test/aura_test_base.h"
diff --git a/ash/accelerators/accelerator_interactive_uitest_chromeos.cc b/ash/accelerators/accelerator_interactive_uitest_chromeos.cc index 30332fc..c9857dd 100644 --- a/ash/accelerators/accelerator_interactive_uitest_chromeos.cc +++ b/ash/accelerators/accelerator_interactive_uitest_chromeos.cc
@@ -4,9 +4,8 @@ #include "ash/accelerators/accelerator_controller.h" -#include "ash/common/shell_observer.h" -#include "ash/common/wm_shell.h" #include "ash/shell.h" +#include "ash/shell_observer.h" #include "ash/system/network/network_observer.h" #include "ash/system/tray/system_tray_delegate.h" #include "ash/system/tray/system_tray_notifier.h" @@ -15,6 +14,7 @@ #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" #include "base/run_loop.h" #include "base/test/user_action_tester.cc" #include "chromeos/network/network_handler.h"
diff --git a/ash/accelerators/accelerator_router.cc b/ash/accelerators/accelerator_router.cc index 36fc6d8..5c726fb 100644 --- a/ash/accelerators/accelerator_router.cc +++ b/ash/accelerators/accelerator_router.cc
@@ -5,9 +5,9 @@ #include "ash/accelerators/accelerator_router.h" #include "ash/accelerators/accelerator_controller.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/wm/window_state.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/metrics/histogram_macros.h" #include "base/stl_util.h" #include "ui/base/accelerators/accelerator.h"
diff --git a/ash/accelerators/ash_focus_manager_factory.cc b/ash/accelerators/ash_focus_manager_factory.cc index 596a8d2..64ae346b 100644 --- a/ash/accelerators/ash_focus_manager_factory.cc +++ b/ash/accelerators/ash_focus_manager_factory.cc
@@ -5,7 +5,7 @@ #include "ash/accelerators/ash_focus_manager_factory.h" #include "ash/accelerators/accelerator_controller.h" -#include "ash/common/wm_shell.h" +#include "ash/wm_shell.h" #include "base/memory/ptr_util.h" #include "ui/views/focus/focus_manager.h"
diff --git a/ash/accelerators/debug_commands.cc b/ash/accelerators/debug_commands.cc index 94e978c0..488da820 100644 --- a/ash/accelerators/debug_commands.cc +++ b/ash/accelerators/debug_commands.cc
@@ -5,17 +5,17 @@ #include "ash/accelerators/debug_commands.h" #include "ash/accelerators/accelerator_commands.h" -#include "ash/common/ash_switches.h" -#include "ash/common/shell_delegate.h" -#include "ash/common/wallpaper/wallpaper_controller.h" -#include "ash/common/wallpaper/wallpaper_delegate.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/ash_switches.h" #include "ash/root_window_controller.h" +#include "ash/shell_delegate.h" #include "ash/system/toast/toast_data.h" #include "ash/system/toast/toast_manager.h" +#include "ash/wallpaper/wallpaper_controller.h" +#include "ash/wallpaper/wallpaper_delegate.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "ash/wm/window_properties.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h"
diff --git a/ash/accelerators/exit_warning_handler.cc b/ash/accelerators/exit_warning_handler.cc index b575066..c4c860a 100644 --- a/ash/accelerators/exit_warning_handler.cc +++ b/ash/accelerators/exit_warning_handler.cc
@@ -4,12 +4,12 @@ #include "ash/accelerators/exit_warning_handler.h" -#include "ash/common/shell_delegate.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/shell_delegate.h" #include "ash/strings/grit/ash_strings.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/ash/accelerators/magnifier_key_scroller.cc b/ash/accelerators/magnifier_key_scroller.cc index 342edbe..b7a462a5 100644 --- a/ash/accelerators/magnifier_key_scroller.cc +++ b/ash/accelerators/magnifier_key_scroller.cc
@@ -7,7 +7,7 @@ #include <utility> #include "ash/accelerators/key_hold_detector.h" -#include "ash/common/ash_switches.h" +#include "ash/ash_switches.h" #include "ash/magnifier/magnification_controller.h" #include "ash/shell.h" #include "base/command_line.h"
diff --git a/ash/accelerators/spoken_feedback_toggler.cc b/ash/accelerators/spoken_feedback_toggler.cc index e62e75c1..c3c2796 100644 --- a/ash/accelerators/spoken_feedback_toggler.cc +++ b/ash/accelerators/spoken_feedback_toggler.cc
@@ -7,9 +7,9 @@ #include <utility> #include "ash/accelerators/key_hold_detector.h" -#include "ash/common/accessibility_delegate.h" -#include "ash/common/accessibility_types.h" -#include "ash/common/wm_shell.h" +#include "ash/accessibility_delegate.h" +#include "ash/accessibility_types.h" +#include "ash/wm_shell.h" #include "ui/events/event.h" namespace ash {
diff --git a/ash/accelerators/spoken_feedback_toggler_unittest.cc b/ash/accelerators/spoken_feedback_toggler_unittest.cc index 8680dcb..1c4dbea 100644 --- a/ash/accelerators/spoken_feedback_toggler_unittest.cc +++ b/ash/accelerators/spoken_feedback_toggler_unittest.cc
@@ -3,10 +3,10 @@ // found in the LICENSE file. #include "ash/accelerators/spoken_feedback_toggler.h" -#include "ash/common/accessibility_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/accessibility_delegate.h" #include "ash/test/ash_test_base.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/window.h" #include "ui/events/test/event_generator.h"
diff --git a/ash/common/accessibility_delegate.h b/ash/accessibility_delegate.h similarity index 96% rename from ash/common/accessibility_delegate.h rename to ash/accessibility_delegate.h index 25c0665..5f8e9b2 100644 --- a/ash/common/accessibility_delegate.h +++ b/ash/accessibility_delegate.h
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_ACCESSIBILITY_DELEGATE_H_ -#define ASH_COMMON_ACCESSIBILITY_DELEGATE_H_ +#ifndef ASH_ACCESSIBILITY_DELEGATE_H_ +#define ASH_ACCESSIBILITY_DELEGATE_H_ +#include "ash/accessibility_types.h" #include "ash/ash_export.h" -#include "ash/common/accessibility_types.h" #include "base/time/time.h" #include "ui/accessibility/ax_enums.h" @@ -143,4 +143,4 @@ } // namespace ash -#endif // ASH_COMMON_ACCESSIBILITY_DELEGATE_H_ +#endif // ASH_ACCESSIBILITY_DELEGATE_H_
diff --git a/ash/common/accessibility_types.h b/ash/accessibility_types.h similarity index 88% rename from ash/common/accessibility_types.h rename to ash/accessibility_types.h index 08b9fe34..56f7551 100644 --- a/ash/common/accessibility_types.h +++ b/ash/accessibility_types.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_ACCESSIBILITY_TYPES_H_ -#define ASH_COMMON_ACCESSIBILITY_TYPES_H_ +#ifndef ASH_ACCESSIBILITY_TYPES_H_ +#define ASH_ACCESSIBILITY_TYPES_H_ namespace ash { @@ -39,4 +39,4 @@ } // namespace ash -#endif // ASH_COMMON_ACCESSIBILITY_TYPES_H_ +#endif // ASH_ACCESSIBILITY_TYPES_H_
diff --git a/ash/app_list/app_list_delegate_impl.cc b/ash/app_list/app_list_delegate_impl.cc index 79b2d89b..9c0e3165 100644 --- a/ash/app_list/app_list_delegate_impl.cc +++ b/ash/app_list/app_list_delegate_impl.cc
@@ -4,11 +4,11 @@ #include "ash/app_list/app_list_delegate_impl.h" -#include "ash/common/wm_shell.h" #include "ash/root_window_controller.h" #include "ash/shelf/app_list_button.h" #include "ash/shelf/shelf_widget.h" #include "ash/shelf/wm_shelf.h" +#include "ash/wm_shell.h" #include "ui/app_list/presenter/app_list.h" namespace ash {
diff --git a/ash/app_list/app_list_presenter_delegate.cc b/ash/app_list/app_list_presenter_delegate.cc index d252ebf0..f052554 100644 --- a/ash/app_list/app_list_presenter_delegate.cc +++ b/ash/app_list/app_list_presenter_delegate.cc
@@ -4,9 +4,7 @@ #include "ash/app_list/app_list_presenter_delegate.h" -#include "ash/common/ash_switches.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/ash_switches.h" #include "ash/display/window_tree_host_manager.h" #include "ash/public/cpp/shelf_types.h" #include "ash/public/cpp/shell_window_ids.h" @@ -19,6 +17,8 @@ #include "ash/shell.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "ash/wm/wm_screen_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "ui/app_list/app_list_constants.h" #include "ui/app_list/app_list_switches.h"
diff --git a/ash/app_list/app_list_presenter_delegate.h b/ash/app_list/app_list_presenter_delegate.h index 7fd185f..44c106c 100644 --- a/ash/app_list/app_list_presenter_delegate.h +++ b/ash/app_list/app_list_presenter_delegate.h
@@ -8,8 +8,8 @@ #include <stdint.h> #include "ash/ash_export.h" -#include "ash/common/shell_observer.h" #include "ash/shelf/wm_shelf_observer.h" +#include "ash/shell_observer.h" #include "base/macros.h" #include "ui/app_list/presenter/app_list_presenter_delegate.h" #include "ui/events/event_handler.h"
diff --git a/ash/app_list/app_list_presenter_delegate_unittest.cc b/ash/app_list/app_list_presenter_delegate_unittest.cc index 3844f22..d45b010 100644 --- a/ash/app_list/app_list_presenter_delegate_unittest.cc +++ b/ash/app_list/app_list_presenter_delegate_unittest.cc
@@ -4,13 +4,13 @@ #include <memory> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/test_app_list_view_presenter_impl.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/macros.h" #include "ui/app_list/views/app_list_view.h" #include "ui/aura/test/test_windows.h"
diff --git a/ash/common/ash_constants.cc b/ash/ash_constants.cc similarity index 94% rename from ash/common/ash_constants.cc rename to ash/ash_constants.cc index 0d0a5a9..b5a2ee7 100644 --- a/ash/common/ash_constants.cc +++ b/ash/ash_constants.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/ash_constants.h" +#include "ash/ash_constants.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/color_palette.h"
diff --git a/ash/common/ash_constants.h b/ash/ash_constants.h similarity index 91% rename from ash/common/ash_constants.h rename to ash/ash_constants.h index cf32eb1..20cfe5b 100644 --- a/ash/common/ash_constants.h +++ b/ash/ash_constants.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_ASH_CONSTANTS_H_ -#define ASH_COMMON_ASH_CONSTANTS_H_ +#ifndef ASH_ASH_CONSTANTS_H_ +#define ASH_ASH_CONSTANTS_H_ #include "ash/ash_export.h" @@ -34,4 +34,4 @@ } // namespace ash -#endif // ASH_COMMON_ASH_CONSTANTS_H_ +#endif // ASH_ASH_CONSTANTS_H_
diff --git a/ash/common/ash_layout_constants.cc b/ash/ash_layout_constants.cc similarity index 96% rename from ash/common/ash_layout_constants.cc rename to ash/ash_layout_constants.cc index e3a98ee..da8aac7 100644 --- a/ash/common/ash_layout_constants.cc +++ b/ash/ash_layout_constants.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/ash_layout_constants.h" +#include "ash/ash_layout_constants.h" #include "base/logging.h" #include "ui/base/material_design/material_design_controller.h"
diff --git a/ash/common/ash_layout_constants.h b/ash/ash_layout_constants.h similarity index 81% rename from ash/common/ash_layout_constants.h rename to ash/ash_layout_constants.h index 075002c..5e0c088b 100644 --- a/ash/common/ash_layout_constants.h +++ b/ash/ash_layout_constants.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_ASH_LAYOUT_CONSTANTS_H_ -#define ASH_COMMON_ASH_LAYOUT_CONSTANTS_H_ +#ifndef ASH_ASH_LAYOUT_CONSTANTS_H_ +#define ASH_ASH_LAYOUT_CONSTANTS_H_ #include "ash/ash_export.h" #include "ui/gfx/geometry/size.h" @@ -21,4 +21,4 @@ ASH_EXPORT gfx::Size GetAshLayoutSize(AshLayoutSize size); -#endif // ASH_COMMON_ASH_LAYOUT_CONSTANTS_H_ +#endif // ASH_ASH_LAYOUT_CONSTANTS_H_
diff --git a/ash/common/ash_switches.cc b/ash/ash_switches.cc similarity index 98% rename from ash/common/ash_switches.cc rename to ash/ash_switches.cc index d1546b1b..7e775ad 100644 --- a/ash/common/ash_switches.cc +++ b/ash/ash_switches.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/ash_switches.h" +#include "ash/ash_switches.h" #include "base/command_line.h" #include "base/sys_info.h"
diff --git a/ash/common/ash_switches.h b/ash/ash_switches.h similarity index 94% rename from ash/common/ash_switches.h rename to ash/ash_switches.h index cec1df6..b16dc0c 100644 --- a/ash/common/ash_switches.h +++ b/ash/ash_switches.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_ASH_SWITCHES_H_ -#define ASH_COMMON_ASH_SWITCHES_H_ +#ifndef ASH_ASH_SWITCHES_H_ +#define ASH_ASH_SWITCHES_H_ #include "ash/ash_export.h" @@ -50,4 +50,4 @@ } // namespace switches } // namespace ash -#endif // ASH_COMMON_ASH_SWITCHES_H_ +#endif // ASH_ASH_SWITCHES_H_
diff --git a/ash/ash_touch_exploration_manager_chromeos.cc b/ash/ash_touch_exploration_manager_chromeos.cc index 5cf171d4..c05e47c 100644 --- a/ash/ash_touch_exploration_manager_chromeos.cc +++ b/ash/ash_touch_exploration_manager_chromeos.cc
@@ -4,13 +4,13 @@ #include "ash/ash_touch_exploration_manager_chromeos.h" -#include "ash/common/accessibility_delegate.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/accessibility_delegate.h" #include "ash/root_window_controller.h" #include "ash/shell.h" #include "ash/system/tray/system_tray_notifier.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "base/memory/ptr_util.h" #include "chromeos/audio/chromeos_sounds.h"
diff --git a/ash/common/ash_view_ids.h b/ash/ash_view_ids.h similarity index 81% rename from ash/common/ash_view_ids.h rename to ash/ash_view_ids.h index 6ed3b5d..69fe5b5 100644 --- a/ash/common/ash_view_ids.h +++ b/ash/ash_view_ids.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_ASH_VIEW_IDS_H_ -#define ASH_COMMON_ASH_VIEW_IDS_H_ +#ifndef ASH_ASH_VIEW_IDS_H_ +#define ASH_ASH_VIEW_IDS_H_ namespace ash { @@ -20,4 +20,4 @@ } // namespace ash -#endif // ASH_COMMON_ASH_VIEW_IDS_H_ +#endif // ASH_ASH_VIEW_IDS_H_
diff --git a/ash/aura/aura_layout_manager_adapter.cc b/ash/aura/aura_layout_manager_adapter.cc index 573095f9..140cad98 100644 --- a/ash/aura/aura_layout_manager_adapter.cc +++ b/ash/aura/aura_layout_manager_adapter.cc
@@ -4,8 +4,8 @@ #include "ash/aura/aura_layout_manager_adapter.h" -#include "ash/common/wm_layout_manager.h" -#include "ash/common/wm_window.h" +#include "ash/wm_layout_manager.h" +#include "ash/wm_window.h" #include "ui/aura/window.h" #include "ui/base/class_property.h"
diff --git a/ash/aura/key_event_watcher_aura.h b/ash/aura/key_event_watcher_aura.h index 83d8ef6..73d2248 100644 --- a/ash/aura/key_event_watcher_aura.h +++ b/ash/aura/key_event_watcher_aura.h
@@ -8,7 +8,7 @@ #include <map> #include "ash/ash_export.h" -#include "ash/common/key_event_watcher.h" +#include "ash/key_event_watcher.h" #include "ui/events/event_handler.h" namespace ui {
diff --git a/ash/aura/pointer_watcher_adapter_unittest.cc b/ash/aura/pointer_watcher_adapter_unittest.cc index 1d25e66..ee7e83c 100644 --- a/ash/aura/pointer_watcher_adapter_unittest.cc +++ b/ash/aura/pointer_watcher_adapter_unittest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm_shell.h" #include "ash/test/ash_test_base.h" +#include "ash/wm_shell.h" #include "ui/events/base_event_utils.h" #include "ui/events/event.h" #include "ui/events/test/event_generator.h"
diff --git a/ash/aura/wm_shell_aura.cc b/ash/aura/wm_shell_aura.cc index 4f6861852..da35615 100644 --- a/ash/aura/wm_shell_aura.cc +++ b/ash/aura/wm_shell_aura.cc
@@ -8,19 +8,16 @@ #include "ash/aura/key_event_watcher_aura.h" #include "ash/aura/pointer_watcher_adapter.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/shell_delegate.h" -#include "ash/common/shell_observer.h" -#include "ash/common/wm_activation_observer.h" -#include "ash/common/wm_display_observer.h" -#include "ash/common/wm_window.h" #include "ash/display/window_tree_host_manager.h" #include "ash/host/ash_window_tree_host_init_params.h" #include "ash/laser/laser_pointer_controller.h" #include "ash/magnifier/partial_magnification_controller.h" #include "ash/metrics/task_switch_metrics_recorder.h" +#include "ash/session/session_state_delegate.h" #include "ash/shared/immersive_fullscreen_controller.h" #include "ash/shell.h" +#include "ash/shell_delegate.h" +#include "ash/shell_observer.h" #include "ash/touch/touch_uma.h" #include "ash/virtual_keyboard_controller.h" #include "ash/wm/drag_window_resizer.h" @@ -32,6 +29,9 @@ #include "ash/wm/window_cycle_event_filter_aura.h" #include "ash/wm/window_util.h" #include "ash/wm/workspace/workspace_event_handler_aura.h" +#include "ash/wm_activation_observer.h" +#include "ash/wm_display_observer.h" +#include "ash/wm_window.h" #include "base/memory/ptr_util.h" #include "ui/aura/client/capture_client.h" #include "ui/aura/client/focus_client.h"
diff --git a/ash/aura/wm_shell_aura.h b/ash/aura/wm_shell_aura.h index cb5f0a1..99c06a6 100644 --- a/ash/aura/wm_shell_aura.h +++ b/ash/aura/wm_shell_aura.h
@@ -8,8 +8,8 @@ #include <memory> #include "ash/ash_export.h" -#include "ash/common/wm_shell.h" #include "ash/display/window_tree_host_manager.h" +#include "ash/wm_shell.h" #include "base/macros.h" #include "base/observer_list.h"
diff --git a/ash/autoclick/autoclick_controller.cc b/ash/autoclick/autoclick_controller.cc index cbe9c0c9b..cb31da34 100644 --- a/ash/autoclick/autoclick_controller.cc +++ b/ash/autoclick/autoclick_controller.cc
@@ -6,10 +6,10 @@ #include "ash/autoclick/common/autoclick_controller_common.h" #include "ash/autoclick/common/autoclick_controller_common_delegate.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" #include "ash/wm/root_window_finder.h" +#include "ash/wm_window.h" #include "base/timer/timer.h" #include "ui/aura/window_observer.h" #include "ui/aura/window_tree_host.h"
diff --git a/ash/autoclick/autoclick_unittest.cc b/ash/autoclick/autoclick_unittest.cc index 73d21ff..953f652 100644 --- a/ash/autoclick/autoclick_unittest.cc +++ b/ash/autoclick/autoclick_unittest.cc
@@ -3,9 +3,9 @@ // found in the LICENSE file. #include "ash/autoclick/autoclick_controller.h" -#include "ash/common/wm_shell.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" +#include "ash/wm_shell.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h"
diff --git a/ash/common/cast_config_controller.cc b/ash/cast_config_controller.cc similarity index 97% rename from ash/common/cast_config_controller.cc rename to ash/cast_config_controller.cc index fc10514..18e014e 100644 --- a/ash/common/cast_config_controller.cc +++ b/ash/cast_config_controller.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/cast_config_controller.h" +#include "ash/cast_config_controller.h" #include <utility> #include <vector>
diff --git a/ash/common/cast_config_controller.h b/ash/cast_config_controller.h similarity index 93% rename from ash/common/cast_config_controller.h rename to ash/cast_config_controller.h index 57a2c5c..5912b98 100644 --- a/ash/common/cast_config_controller.h +++ b/ash/cast_config_controller.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_CAST_CONFIG_CONTROLLER_H_ -#define ASH_COMMON_CAST_CONFIG_CONTROLLER_H_ +#ifndef ASH_CAST_CONFIG_CONTROLLER_H_ +#define ASH_CAST_CONFIG_CONTROLLER_H_ #include <vector> @@ -66,4 +66,4 @@ } // namespace ash -#endif // ASH_COMMON_CAST_CONFIG_CONTROLLER_H_ +#endif // ASH_CAST_CONFIG_CONTROLLER_H_
diff --git a/ash/common/DEPS b/ash/common/DEPS deleted file mode 100644 index dbf6b2b..0000000 --- a/ash/common/DEPS +++ /dev/null
@@ -1,13 +0,0 @@ -include_rules = [ - "+components/prefs", - "+components/ui_devtools", - "+mojo/public/cpp", - "+services/preferences/public", - "+ui", -] - -specific_include_rules = { - ".*test\.cc": [ - "+ash/test", - ] -}
diff --git a/ash/content/display/screen_orientation_controller_chromeos_unittest.cc b/ash/content/display/screen_orientation_controller_chromeos_unittest.cc index e89c7b3..0937340 100644 --- a/ash/content/display/screen_orientation_controller_chromeos_unittest.cc +++ b/ash/content/display/screen_orientation_controller_chromeos_unittest.cc
@@ -7,8 +7,7 @@ #include <memory> #include <vector> -#include "ash/common/ash_switches.h" -#include "ash/common/wm_shell.h" +#include "ash/ash_switches.h" #include "ash/content/shell_content_state.h" #include "ash/shell.h" #include "ash/system/screen_layout_observer.h" @@ -19,6 +18,7 @@ #include "ash/test/test_shell_delegate.h" #include "ash/test/test_system_tray_delegate.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm_shell.h" #include "base/command_line.h" #include "chromeos/accelerometer/accelerometer_reader.h" #include "chromeos/accelerometer/accelerometer_types.h"
diff --git a/ash/content/gpu_support_impl.h b/ash/content/gpu_support_impl.h index ad968a8b..f94b2e8 100644 --- a/ash/content/gpu_support_impl.h +++ b/ash/content/gpu_support_impl.h
@@ -5,8 +5,8 @@ #ifndef ASH_CONTENT_GPU_SUPPORT_IMPL_H_ #define ASH_CONTENT_GPU_SUPPORT_IMPL_H_ -#include "ash/common/gpu_support.h" #include "ash/content/ash_with_content_export.h" +#include "ash/gpu_support.h" #include "base/macros.h" namespace ash {
diff --git a/ash/content/screen_orientation_delegate_chromeos.cc b/ash/content/screen_orientation_delegate_chromeos.cc index 76243b2..aae1841a 100644 --- a/ash/content/screen_orientation_delegate_chromeos.cc +++ b/ash/content/screen_orientation_delegate_chromeos.cc
@@ -4,9 +4,9 @@ #include "ash/content/screen_orientation_delegate_chromeos.h" -#include "ash/common/wm_window.h" #include "ash/display/screen_orientation_controller_chromeos.h" #include "ash/shell.h" +#include "ash/wm_window.h" #include "content/public/browser/web_contents.h" namespace ash {
diff --git a/ash/common/default_accessibility_delegate.cc b/ash/default_accessibility_delegate.cc similarity index 98% rename from ash/common/default_accessibility_delegate.cc rename to ash/default_accessibility_delegate.cc index 6a1bd37..7e6fad3 100644 --- a/ash/common/default_accessibility_delegate.cc +++ b/ash/default_accessibility_delegate.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/default_accessibility_delegate.h" +#include "ash/default_accessibility_delegate.h" #include <limits>
diff --git a/ash/common/default_accessibility_delegate.h b/ash/default_accessibility_delegate.h similarity index 92% rename from ash/common/default_accessibility_delegate.h rename to ash/default_accessibility_delegate.h index 46af280..5dd62c7b 100644 --- a/ash/common/default_accessibility_delegate.h +++ b/ash/default_accessibility_delegate.h
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_DEFAULT_ACCESSIBILITY_DELEGATE_H_ -#define ASH_COMMON_DEFAULT_ACCESSIBILITY_DELEGATE_H_ +#ifndef ASH_DEFAULT_ACCESSIBILITY_DELEGATE_H_ +#define ASH_DEFAULT_ACCESSIBILITY_DELEGATE_H_ +#include "ash/accessibility_delegate.h" +#include "ash/accessibility_types.h" #include "ash/ash_export.h" -#include "ash/common/accessibility_delegate.h" -#include "ash/common/accessibility_types.h" #include "base/macros.h" namespace ash { @@ -78,4 +78,4 @@ } // namespace ash -#endif // ASH_COMMON_DEFAULT_ACCESSIBILITY_DELEGATE_H_ +#endif // ASH_DEFAULT_ACCESSIBILITY_DELEGATE_H_
diff --git a/ash/default_wallpaper_delegate.cc b/ash/default_wallpaper_delegate.cc index 1e78a74..319fad3 100644 --- a/ash/default_wallpaper_delegate.cc +++ b/ash/default_wallpaper_delegate.cc
@@ -4,8 +4,8 @@ #include "ash/default_wallpaper_delegate.h" -#include "ash/common/wallpaper/wallpaper_controller.h" -#include "ash/common/wm_shell.h" +#include "ash/wallpaper/wallpaper_controller.h" +#include "ash/wm_shell.h" #include "ui/wm/core/window_animations.h" namespace ash {
diff --git a/ash/default_wallpaper_delegate.h b/ash/default_wallpaper_delegate.h index ab3ec0e..12a9223 100644 --- a/ash/default_wallpaper_delegate.h +++ b/ash/default_wallpaper_delegate.h
@@ -6,7 +6,7 @@ #define ASH_DEFAULT_WALLPAPER_DELEGATE_H_ #include "ash/ash_export.h" -#include "ash/common/wallpaper/wallpaper_delegate.h" +#include "ash/wallpaper/wallpaper_delegate.h" #include "base/macros.h" namespace ash {
diff --git a/ash/common/devtools/OWNERS b/ash/devtools/OWNERS similarity index 100% rename from ash/common/devtools/OWNERS rename to ash/devtools/OWNERS
diff --git a/ash/common/devtools/ash_devtools_css_agent.cc b/ash/devtools/ash_devtools_css_agent.cc similarity index 98% rename from ash/common/devtools/ash_devtools_css_agent.cc rename to ash/devtools/ash_devtools_css_agent.cc index 390dea0c..bef7c812 100644 --- a/ash/common/devtools/ash_devtools_css_agent.cc +++ b/ash/devtools/ash_devtools_css_agent.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/devtools/ash_devtools_css_agent.h" +#include "ash/devtools/ash_devtools_css_agent.h" -#include "ash/common/wm_window.h" +#include "ash/wm_window.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h"
diff --git a/ash/common/devtools/ash_devtools_css_agent.h b/ash/devtools/ash_devtools_css_agent.h similarity index 89% rename from ash/common/devtools/ash_devtools_css_agent.h rename to ash/devtools/ash_devtools_css_agent.h index 84f645d..cffe440 100644 --- a/ash/common/devtools/ash_devtools_css_agent.h +++ b/ash/devtools/ash_devtools_css_agent.h
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_DEVTOOLS_ASH_DEVTOOLS_CSS_AGENT_H_ -#define ASH_COMMON_DEVTOOLS_ASH_DEVTOOLS_CSS_AGENT_H_ +#ifndef ASH_DEVTOOLS_ASH_DEVTOOLS_CSS_AGENT_H_ +#define ASH_DEVTOOLS_ASH_DEVTOOLS_CSS_AGENT_H_ -#include "ash/common/devtools/ash_devtools_dom_agent.h" +#include "ash/devtools/ash_devtools_dom_agent.h" #include "components/ui_devtools/CSS.h" #include "ui/views/widget/widget_observer.h" @@ -54,4 +54,4 @@ } // namespace devtools } // namespace ash -#endif // ASH_COMMON_DEVTOOLS_ASH_DEVTOOLS_CSS_AGENT_H_ +#endif // ASH_DEVTOOLS_ASH_DEVTOOLS_CSS_AGENT_H_
diff --git a/ash/common/devtools/ash_devtools_dom_agent.cc b/ash/devtools/ash_devtools_dom_agent.cc similarity index 99% rename from ash/common/devtools/ash_devtools_dom_agent.cc rename to ash/devtools/ash_devtools_dom_agent.cc index 79aa4339..0f00d40 100644 --- a/ash/common/devtools/ash_devtools_dom_agent.cc +++ b/ash/devtools/ash_devtools_dom_agent.cc
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/devtools/ash_devtools_dom_agent.h" +#include "ash/devtools/ash_devtools_dom_agent.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/wm_window.h" #include "components/ui_devtools/devtools_server.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/display/display.h"
diff --git a/ash/common/devtools/ash_devtools_dom_agent.h b/ash/devtools/ash_devtools_dom_agent.h similarity index 96% rename from ash/common/devtools/ash_devtools_dom_agent.h rename to ash/devtools/ash_devtools_dom_agent.h index c66a04f2..645e1137 100644 --- a/ash/common/devtools/ash_devtools_dom_agent.h +++ b/ash/devtools/ash_devtools_dom_agent.h
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_DEVTOOLS_ASH_DEVTOOLS_DOM_AGENT_H_ -#define ASH_COMMON_DEVTOOLS_ASH_DEVTOOLS_DOM_AGENT_H_ +#ifndef ASH_DEVTOOLS_ASH_DEVTOOLS_DOM_AGENT_H_ +#define ASH_DEVTOOLS_ASH_DEVTOOLS_DOM_AGENT_H_ -#include "ash/common/wm_shell.h" +#include "ash/wm_shell.h" #include "base/compiler_specific.h" #include "base/observer_list.h" #include "components/ui_devtools/DOM.h" @@ -152,4 +152,4 @@ } // namespace devtools } // namespace ash -#endif // ASH_COMMON_DEVTOOLS_ASH_DEVTOOLS_DOM_AGENT_H_ +#endif // ASH_DEVTOOLS_ASH_DEVTOOLS_DOM_AGENT_H_
diff --git a/ash/common/devtools/ash_devtools_unittest.cc b/ash/devtools/ash_devtools_unittest.cc similarity index 99% rename from ash/common/devtools/ash_devtools_unittest.cc rename to ash/devtools/ash_devtools_unittest.cc index 9aa0192..2d31644 100644 --- a/ash/common/devtools/ash_devtools_unittest.cc +++ b/ash/devtools/ash_devtools_unittest.cc
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/devtools/ash_devtools_css_agent.h" -#include "ash/common/devtools/ash_devtools_dom_agent.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/devtools/ash_devtools_css_agent.h" +#include "ash/devtools/ash_devtools_dom_agent.h" #include "ash/root_window_controller.h" #include "ash/test/ash_test.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/memory/ptr_util.h" #include "base/strings/stringprintf.h" #include "ui/display/display.h"
diff --git a/ash/display/cursor_window_controller.cc b/ash/display/cursor_window_controller.cc index 4c654c5..1d2297d 100644 --- a/ash/display/cursor_window_controller.cc +++ b/ash/display/cursor_window_controller.cc
@@ -4,8 +4,8 @@ #include "ash/display/cursor_window_controller.h" -#include "ash/common/ash_constants.h" -#include "ash/common/ash_switches.h" +#include "ash/ash_constants.h" +#include "ash/ash_switches.h" #include "ash/display/mirror_window_controller.h" #include "ash/display/window_tree_host_manager.h" #include "ash/public/cpp/shell_window_ids.h"
diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc index b8b856c..9800abda 100644 --- a/ash/display/display_manager_unittest.cc +++ b/ash/display/display_manager_unittest.cc
@@ -5,7 +5,7 @@ #include "ui/display/manager/display_manager.h" #include "ash/accelerators/accelerator_commands_aura.h" -#include "ash/common/ash_switches.h" +#include "ash/ash_switches.h" #include "ash/display/display_configuration_controller.h" #include "ash/display/display_util.h" #include "ash/display/mirror_window_controller.h"
diff --git a/ash/display/display_util.cc b/ash/display/display_util.cc index 271802a..e6a9164 100644 --- a/ash/display/display_util.cc +++ b/ash/display/display_util.cc
@@ -7,16 +7,16 @@ #include <algorithm> #include <utility> -#include "ash/common/new_window_controller.h" -#include "ash/common/wm_shell.h" #include "ash/display/extended_mouse_warp_controller.h" #include "ash/display/null_mouse_warp_controller.h" #include "ash/display/unified_mouse_warp_controller.h" #include "ash/host/ash_window_tree_host.h" +#include "ash/new_window_controller.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/shell.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/system_notifier.h" +#include "ash/wm_shell.h" #include "base/memory/ptr_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/ash/display/projecting_observer_chromeos.h b/ash/display/projecting_observer_chromeos.h index f7c46bf8..22f79c5 100644 --- a/ash/display/projecting_observer_chromeos.h +++ b/ash/display/projecting_observer_chromeos.h
@@ -6,7 +6,7 @@ #define ASH_DISPLAY_PROJECTING_OBSERVER_CHROMEOS_H_ #include "ash/ash_export.h" -#include "ash/common/shell_observer.h" +#include "ash/shell_observer.h" #include "base/macros.h" #include "ui/display/manager/chromeos/display_configurator.h"
diff --git a/ash/display/root_window_transformers.cc b/ash/display/root_window_transformers.cc index 2cb292f..1af5185 100644 --- a/ash/display/root_window_transformers.cc +++ b/ash/display/root_window_transformers.cc
@@ -6,7 +6,7 @@ #include <cmath> -#include "ash/common/ash_switches.h" +#include "ash/ash_switches.h" #include "ash/host/root_window_transformer.h" #include "ash/magnifier/magnification_controller.h" #include "ash/shell.h"
diff --git a/ash/display/screen_ash.cc b/ash/display/screen_ash.cc index b743dc7..e10fc3e 100644 --- a/ash/display/screen_ash.cc +++ b/ash/display/screen_ash.cc
@@ -4,13 +4,13 @@ #include "ash/display/screen_ash.h" -#include "ash/common/wm_window.h" #include "ash/display/window_tree_host_manager.h" #include "ash/root_window_controller.h" #include "ash/root_window_settings.h" #include "ash/shelf/shelf_widget.h" #include "ash/shell.h" #include "ash/wm/root_window_finder.h" +#include "ash/wm_window.h" #include "base/logging.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/env.h"
diff --git a/ash/display/screen_orientation_controller_chromeos.cc b/ash/display/screen_orientation_controller_chromeos.cc index 1a0ce91..0a3e0984 100644 --- a/ash/display/screen_orientation_controller_chromeos.cc +++ b/ash/display/screen_orientation_controller_chromeos.cc
@@ -4,12 +4,12 @@ #include "ash/display/screen_orientation_controller_chromeos.h" -#include "ash/common/ash_switches.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/ash_switches.h" #include "ash/display/display_configuration_controller.h" #include "ash/shell.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/auto_reset.h" #include "base/command_line.h" #include "chromeos/accelerometer/accelerometer_reader.h"
diff --git a/ash/display/screen_orientation_controller_chromeos.h b/ash/display/screen_orientation_controller_chromeos.h index e0d0e5bd..356975ed 100644 --- a/ash/display/screen_orientation_controller_chromeos.h +++ b/ash/display/screen_orientation_controller_chromeos.h
@@ -8,9 +8,9 @@ #include <map> #include "ash/ash_export.h" -#include "ash/common/shell_observer.h" -#include "ash/common/wm_activation_observer.h" -#include "ash/common/wm_display_observer.h" +#include "ash/shell_observer.h" +#include "ash/wm_activation_observer.h" +#include "ash/wm_display_observer.h" #include "base/macros.h" #include "base/observer_list.h" #include "chromeos/accelerometer/accelerometer_reader.h"
diff --git a/ash/display/screen_position_controller.cc b/ash/display/screen_position_controller.cc index a11c24a..7bd9c9ba 100644 --- a/ash/display/screen_position_controller.cc +++ b/ash/display/screen_position_controller.cc
@@ -4,13 +4,13 @@ #include "ash/display/screen_position_controller.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" #include "ash/wm/window_positioning_utils.h" #include "ash/wm/window_properties.h" #include "ash/wm/window_state.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" #include "ui/compositor/dip_util.h"
diff --git a/ash/display/shutdown_observer_chromeos.cc b/ash/display/shutdown_observer_chromeos.cc index a29830b..b3a5b637 100644 --- a/ash/display/shutdown_observer_chromeos.cc +++ b/ash/display/shutdown_observer_chromeos.cc
@@ -4,7 +4,7 @@ #include "ash/display/shutdown_observer_chromeos.h" -#include "ash/common/wm_shell.h" +#include "ash/wm_shell.h" #include "ui/display/manager/chromeos/display_configurator.h" namespace ash {
diff --git a/ash/display/shutdown_observer_chromeos.h b/ash/display/shutdown_observer_chromeos.h index 454eb40..67c69ee1 100644 --- a/ash/display/shutdown_observer_chromeos.h +++ b/ash/display/shutdown_observer_chromeos.h
@@ -5,7 +5,7 @@ #ifndef ASH_DISPLAY_SHUTDOWN_OBSERVER_CHROMEOS_H_ #define ASH_DISPLAY_SHUTDOWN_OBSERVER_CHROMEOS_H_ -#include "ash/common/shell_observer.h" +#include "ash/shell_observer.h" #include "base/macros.h" namespace display {
diff --git a/ash/display/window_tree_host_manager.cc b/ash/display/window_tree_host_manager.cc index 49d7277..64d1f3e 100644 --- a/ash/display/window_tree_host_manager.cc +++ b/ash/display/window_tree_host_manager.cc
@@ -10,7 +10,7 @@ #include <memory> #include <utility> -#include "ash/common/ash_switches.h" +#include "ash/ash_switches.h" #include "ash/display/cursor_window_controller.h" #include "ash/display/mirror_window_controller.h" #include "ash/display/root_window_transformers.h"
diff --git a/ash/display/window_tree_host_manager_unittest.cc b/ash/display/window_tree_host_manager_unittest.cc index 5aab608..374b8bc4 100644 --- a/ash/display/window_tree_host_manager_unittest.cc +++ b/ash/display/window_tree_host_manager_unittest.cc
@@ -6,7 +6,6 @@ #include <memory> -#include "ash/common/wm_window.h" #include "ash/display/display_util.h" #include "ash/screen_util.h" #include "ash/shelf/shelf_widget.h" @@ -20,6 +19,7 @@ #include "ash/wm/window_state_aura.h" #include "ash/wm/wm_event.h" #include "ash/wm/wm_screen_util.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "ui/aura/client/focus_change_observer.h" #include "ui/aura/client/focus_client.h"
diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc index 3c16d1fb0..d0370a58 100644 --- a/ash/drag_drop/drag_drop_controller.cc +++ b/ash/drag_drop/drag_drop_controller.cc
@@ -6,11 +6,11 @@ #include <utility> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/drag_drop/drag_drop_tracker.h" #include "ash/drag_drop/drag_image_view.h" #include "ash/shell.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/bind.h" #include "base/message_loop/message_loop.h" #include "base/metrics/histogram_macros.h"
diff --git a/ash/drag_drop/drag_drop_controller.h b/ash/drag_drop/drag_drop_controller.h index 728d9a2..1282063 100644 --- a/ash/drag_drop/drag_drop_controller.h +++ b/ash/drag_drop/drag_drop_controller.h
@@ -8,7 +8,7 @@ #include <memory> #include "ash/ash_export.h" -#include "ash/common/wm_display_observer.h" +#include "ash/wm_display_observer.h" #include "base/callback.h" #include "base/macros.h" #include "base/memory/weak_ptr.h"
diff --git a/ash/drag_drop/drag_drop_tracker.cc b/ash/drag_drop/drag_drop_tracker.cc index e64897b..39b8bc0 100644 --- a/ash/drag_drop/drag_drop_tracker.cc +++ b/ash/drag_drop/drag_drop_tracker.cc
@@ -4,10 +4,10 @@ #include "ash/drag_drop/drag_drop_tracker.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" #include "ash/wm/root_window_finder.h" +#include "ash/wm_window.h" #include "ui/aura/client/window_parenting_client.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h"
diff --git a/ash/drag_drop/drag_drop_tracker_unittest.cc b/ash/drag_drop/drag_drop_tracker_unittest.cc index 3694b062..9401f88f 100644 --- a/ash/drag_drop/drag_drop_tracker_unittest.cc +++ b/ash/drag_drop/drag_drop_tracker_unittest.cc
@@ -6,12 +6,12 @@ #include <memory> -#include "ash/common/scoped_root_window_for_new_windows.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/scoped_root_window_for_new_windows.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h"
diff --git a/ash/drag_drop/drag_image_view.cc b/ash/drag_drop/drag_image_view.cc index 4cb2beb..15e7527 100644 --- a/ash/drag_drop/drag_image_view.cc +++ b/ash/drag_drop/drag_image_view.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/wm_window.h" #include "skia/ext/image_operations.h" #include "ui/base/resource/resource_bundle.h" #include "ui/display/display.h"
diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc index 62c1b9f..710c4999 100644 --- a/ash/extended_desktop_unittest.cc +++ b/ash/extended_desktop_unittest.cc
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/shell.h" @@ -11,6 +10,7 @@ #include "ash/wm/root_window_finder.h" #include "ash/wm/window_properties.h" #include "ash/wm/window_util.h" +#include "ash/wm_window.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "ui/aura/client/capture_client.h"
diff --git a/ash/first_run/first_run_helper_impl.cc b/ash/first_run/first_run_helper_impl.cc index af9c7fef..bcd49ce 100644 --- a/ash/first_run/first_run_helper_impl.cc +++ b/ash/first_run/first_run_helper_impl.cc
@@ -4,14 +4,14 @@ #include "ash/first_run/first_run_helper_impl.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shelf/app_list_button.h" #include "ash/shelf/shelf_widget.h" #include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/system/tray/system_tray.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/logging.h" #include "ui/app_list/views/app_list_view.h" #include "ui/aura/window.h"
diff --git a/ash/common/focus_cycler.cc b/ash/focus_cycler.cc similarity index 96% rename from ash/common/focus_cycler.cc rename to ash/focus_cycler.cc index 47ef19b..b858307 100644 --- a/ash/common/focus_cycler.cc +++ b/ash/focus_cycler.cc
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/focus_cycler.h" +#include "ash/focus_cycler.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_shell.h" +#include "ash/wm_window.h" #include "ui/views/accessible_pane_view.h" #include "ui/views/focus/focus_search.h" #include "ui/views/widget/widget.h"
diff --git a/ash/common/focus_cycler.h b/ash/focus_cycler.h similarity index 92% rename from ash/common/focus_cycler.h rename to ash/focus_cycler.h index 03286fd..d095640 100644 --- a/ash/common/focus_cycler.h +++ b/ash/focus_cycler.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_FOCUS_CYCLER_H_ -#define ASH_COMMON_FOCUS_CYCLER_H_ +#ifndef ASH_FOCUS_CYCLER_H_ +#define ASH_FOCUS_CYCLER_H_ #include <vector> @@ -53,4 +53,4 @@ } // namespace ash -#endif // ASH_COMMON_FOCUS_CYCLER_H_ +#endif // ASH_FOCUS_CYCLER_H_
diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc index 5166b718..6fc84fb 100644 --- a/ash/focus_cycler_unittest.cc +++ b/ash/focus_cycler_unittest.cc
@@ -2,11 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/focus_cycler.h" +#include "ash/focus_cycler.h" #include <memory> -#include "ash/common/wm_shell.h" #include "ash/shelf/shelf_widget.h" #include "ash/shelf/wm_shelf.h" #include "ash/system/status_area_widget.h" @@ -15,6 +14,7 @@ #include "ash/test/ash_test_base.h" #include "ash/test/status_area_widget_test_helper.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h"
diff --git a/ash/frame/caption_buttons/frame_caption_button_container_view.cc b/ash/frame/caption_buttons/frame_caption_button_container_view.cc index 63a97dd..67912c2 100644 --- a/ash/frame/caption_buttons/frame_caption_button_container_view.cc +++ b/ash/frame/caption_buttons/frame_caption_button_container_view.cc
@@ -7,10 +7,10 @@ #include <cmath> #include <map> -#include "ash/common/wm_shell.h" #include "ash/frame/caption_buttons/frame_caption_button.h" #include "ash/frame/caption_buttons/frame_size_button.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm_shell.h" #include "ui/base/hit_test.h" #include "ui/base/l10n/l10n_util.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h"
diff --git a/ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc b/ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc index f2be7fee..b43c2c6 100644 --- a/ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc +++ b/ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc
@@ -4,13 +4,13 @@ #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" -#include "ash/common/ash_layout_constants.h" -#include "ash/common/wm_shell.h" +#include "ash/ash_layout_constants.h" #include "ash/frame/caption_buttons/frame_caption_button.h" #include "ash/resources/grit/ash_resources.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/test/ash_test_base.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm_shell.h" #include "ui/gfx/geometry/rect.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h"
diff --git a/ash/frame/caption_buttons/frame_size_button.cc b/ash/frame/caption_buttons/frame_size_button.cc index 7fa8612a..45959042 100644 --- a/ash/frame/caption_buttons/frame_size_button.cc +++ b/ash/frame/caption_buttons/frame_size_button.cc
@@ -4,12 +4,12 @@ #include "ash/frame/caption_buttons/frame_size_button.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/wm/window_positioning_utils.h" #include "ash/wm/window_state.h" #include "ash/wm/wm_event.h" #include "ash/wm/workspace/phantom_window_controller.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/i18n/rtl.h" #include "ui/gfx/geometry/vector2d.h" #include "ui/views/widget/widget.h"
diff --git a/ash/frame/caption_buttons/frame_size_button_unittest.cc b/ash/frame/caption_buttons/frame_size_button_unittest.cc index 9742dbf..e0dcf7c 100644 --- a/ash/frame/caption_buttons/frame_size_button_unittest.cc +++ b/ash/frame/caption_buttons/frame_size_button_unittest.cc
@@ -4,7 +4,7 @@ #include "ash/frame/caption_buttons/frame_size_button.h" -#include "ash/common/ash_layout_constants.h" +#include "ash/ash_layout_constants.h" #include "ash/frame/caption_buttons/frame_caption_button.h" #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" #include "ash/resources/grit/ash_resources.h"
diff --git a/ash/frame/custom_frame_view_ash.cc b/ash/frame/custom_frame_view_ash.cc index a41420ff..ab523e7 100644 --- a/ash/frame/custom_frame_view_ash.cc +++ b/ash/frame/custom_frame_view_ash.cc
@@ -7,8 +7,6 @@ #include <algorithm> #include <vector> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" #include "ash/frame/frame_border_hit_test.h" #include "ash/frame/header_view.h" @@ -17,6 +15,8 @@ #include "ash/wm/window_state.h" #include "ash/wm/window_state_delegate.h" #include "ash/wm/window_state_observer.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" #include "ui/aura/window_observer.h"
diff --git a/ash/frame/custom_frame_view_ash_unittest.cc b/ash/frame/custom_frame_view_ash_unittest.cc index 27c7e272..075ed14 100644 --- a/ash/frame/custom_frame_view_ash_unittest.cc +++ b/ash/frame/custom_frame_view_ash_unittest.cc
@@ -6,13 +6,13 @@ #include <memory> -#include "ash/common/ash_layout_constants.h" -#include "ash/common/wm_shell.h" +#include "ash/ash_layout_constants.h" #include "ash/frame/caption_buttons/frame_caption_button.h" #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" #include "ash/test/ash_test_base.h" #include "ash/test/test_session_state_delegate.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm_shell.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_unittest_util.h"
diff --git a/ash/frame/default_header_painter.cc b/ash/frame/default_header_painter.cc index de78dbb8..33c976e 100644 --- a/ash/frame/default_header_painter.cc +++ b/ash/frame/default_header_painter.cc
@@ -4,7 +4,7 @@ #include "ash/frame/default_header_painter.h" -#include "ash/common/ash_layout_constants.h" +#include "ash/ash_layout_constants.h" #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" #include "ash/frame/header_painter_util.h" #include "ash/resources/grit/ash_resources.h"
diff --git a/ash/frame/frame_border_hit_test.cc b/ash/frame/frame_border_hit_test.cc index 58cb7ff1..e9d3258 100644 --- a/ash/frame/frame_border_hit_test.cc +++ b/ash/frame/frame_border_hit_test.cc
@@ -4,9 +4,9 @@ #include "ash/frame/frame_border_hit_test.h" -#include "ash/common/ash_constants.h" -#include "ash/common/wm_shell.h" +#include "ash/ash_constants.h" #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" +#include "ash/wm_shell.h" #include "ui/base/hit_test.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h"
diff --git a/ash/frame/header_painter_util.cc b/ash/frame/header_painter_util.cc index 4d8b4a7..d7d79f8 100644 --- a/ash/frame/header_painter_util.cc +++ b/ash/frame/header_painter_util.cc
@@ -6,7 +6,7 @@ #include <algorithm> -#include "ash/common/wm_window.h" +#include "ash/wm_window.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animator.h" #include "ui/gfx/font_list.h"
diff --git a/ash/frame/header_view.cc b/ash/frame/header_view.cc index 206489c..0effeaf 100644 --- a/ash/frame/header_view.cc +++ b/ash/frame/header_view.cc
@@ -4,11 +4,11 @@ #include "ash/frame/header_view.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" #include "ash/frame/default_header_painter.h" +#include "ash/session/session_state_delegate.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/gfx/canvas.h" #include "ui/views/controls/image_view.h" #include "ui/views/widget/widget.h"
diff --git a/ash/frame/header_view.h b/ash/frame/header_view.h index 78c9774..06e4f5d 100644 --- a/ash/frame/header_view.h +++ b/ash/frame/header_view.h
@@ -8,8 +8,8 @@ #include <memory> #include "ash/ash_export.h" -#include "ash/common/shell_observer.h" #include "ash/shared/immersive_fullscreen_controller_delegate.h" +#include "ash/shell_observer.h" #include "base/macros.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/views/view.h"
diff --git a/ash/common/gpu_support.h b/ash/gpu_support.h similarity index 87% rename from ash/common/gpu_support.h rename to ash/gpu_support.h index 0e066691..9acda9c 100644 --- a/ash/common/gpu_support.h +++ b/ash/gpu_support.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_GPU_SUPPORT_H_ -#define ASH_COMMON_GPU_SUPPORT_H_ +#ifndef ASH_GPU_SUPPORT_H_ +#define ASH_GPU_SUPPORT_H_ #include <list> @@ -30,4 +30,4 @@ } // namespace ash -#endif // ASH_COMMON_GPU_SUPPORT_H_ +#endif // ASH_GPU_SUPPORT_H_
diff --git a/ash/common/gpu_support_stub.cc b/ash/gpu_support_stub.cc similarity index 91% rename from ash/common/gpu_support_stub.cc rename to ash/gpu_support_stub.cc index ab7ac0d..0970f3e5 100644 --- a/ash/common/gpu_support_stub.cc +++ b/ash/gpu_support_stub.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/gpu_support_stub.h" +#include "ash/gpu_support_stub.h" namespace ash {
diff --git a/ash/common/gpu_support_stub.h b/ash/gpu_support_stub.h similarity index 80% rename from ash/common/gpu_support_stub.h rename to ash/gpu_support_stub.h index 870c7b8..0de30db8 100644 --- a/ash/common/gpu_support_stub.h +++ b/ash/gpu_support_stub.h
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_GPU_SUPPORT_STUB_H_ -#define ASH_COMMON_GPU_SUPPORT_STUB_H_ +#ifndef ASH_GPU_SUPPORT_STUB_H_ +#define ASH_GPU_SUPPORT_STUB_H_ #include "ash/ash_export.h" -#include "ash/common/gpu_support.h" +#include "ash/gpu_support.h" #include "base/macros.h" namespace ash { @@ -28,4 +28,4 @@ } // namespace ash -#endif // ASH_COMMON_GPU_SUPPORT_STUB_H_ +#endif // ASH_GPU_SUPPORT_STUB_H_
diff --git a/ash/high_contrast/high_contrast_controller.cc b/ash/high_contrast/high_contrast_controller.cc index 38c0ee7..4f3bffa 100644 --- a/ash/high_contrast/high_contrast_controller.cc +++ b/ash/high_contrast/high_contrast_controller.cc
@@ -4,9 +4,9 @@ #include "ash/high_contrast/high_contrast_controller.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/shell.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h"
diff --git a/ash/high_contrast/high_contrast_controller.h b/ash/high_contrast/high_contrast_controller.h index 02b594c..7dd06754 100644 --- a/ash/high_contrast/high_contrast_controller.h +++ b/ash/high_contrast/high_contrast_controller.h
@@ -6,7 +6,7 @@ #define ASH_HIGH_CONTRAST_HIGH_CONTRAST_CONTROLLER_H_ #include "ash/ash_export.h" -#include "ash/common/shell_observer.h" +#include "ash/shell_observer.h" #include "base/macros.h" namespace aura {
diff --git a/ash/common/ime_control_delegate.h b/ash/ime_control_delegate.h similarity index 88% rename from ash/common/ime_control_delegate.h rename to ash/ime_control_delegate.h index 37f0adf..5dbc52c0 100644 --- a/ash/common/ime_control_delegate.h +++ b/ash/ime_control_delegate.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_IME_CONTROL_DELEGATE_H_ -#define ASH_COMMON_IME_CONTROL_DELEGATE_H_ +#ifndef ASH_IME_CONTROL_DELEGATE_H_ +#define ASH_IME_CONTROL_DELEGATE_H_ namespace ui { class Accelerator; @@ -37,4 +37,4 @@ } // namespace ash -#endif // ASH_COMMON_IME_CONTROL_DELEGATE_H_ +#endif // ASH_IME_CONTROL_DELEGATE_H_
diff --git a/ash/common/key_event_watcher.cc b/ash/key_event_watcher.cc similarity index 94% rename from ash/common/key_event_watcher.cc rename to ash/key_event_watcher.cc index cf3d368..7148f0e 100644 --- a/ash/common/key_event_watcher.cc +++ b/ash/key_event_watcher.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/key_event_watcher.h" +#include "ash/key_event_watcher.h" namespace ash {
diff --git a/ash/common/key_event_watcher.h b/ash/key_event_watcher.h similarity index 90% rename from ash/common/key_event_watcher.h rename to ash/key_event_watcher.h index 80b649f..5c23a74 100644 --- a/ash/common/key_event_watcher.h +++ b/ash/key_event_watcher.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_KEY_EVENT_WATCHER_H_ -#define ASH_COMMON_KEY_EVENT_WATCHER_H_ +#ifndef ASH_KEY_EVENT_WATCHER_H_ +#define ASH_KEY_EVENT_WATCHER_H_ #include <map> @@ -46,4 +46,4 @@ } // namespace ash -#endif // ASH_COMMON_KEY_EVENT_WATCHER_H_ +#endif // ASH_KEY_EVENT_WATCHER_H_
diff --git a/ash/common/keyboard/keyboard_ui.cc b/ash/keyboard/keyboard_ui.cc similarity index 91% rename from ash/common/keyboard/keyboard_ui.cc rename to ash/keyboard/keyboard_ui.cc index 35af6b1..7a380f1 100644 --- a/ash/common/keyboard/keyboard_ui.cc +++ b/ash/keyboard/keyboard_ui.cc
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/keyboard/keyboard_ui.h" +#include "ash/keyboard/keyboard_ui.h" -#include "ash/common/accessibility_delegate.h" -#include "ash/common/keyboard/keyboard_ui_observer.h" -#include "ash/common/wm_shell.h" +#include "ash/accessibility_delegate.h" +#include "ash/keyboard/keyboard_ui_observer.h" #include "ash/system/accessibility_observer.h" #include "ash/system/tray/system_tray_notifier.h" #include "ash/system/tray_accessibility.h" +#include "ash/wm_shell.h" #include "base/memory/ptr_util.h" #include "ui/keyboard/keyboard_controller.h"
diff --git a/ash/common/keyboard/keyboard_ui.h b/ash/keyboard/keyboard_ui.h similarity index 89% rename from ash/common/keyboard/keyboard_ui.h rename to ash/keyboard/keyboard_ui.h index b9d7dcfc..e862241 100644 --- a/ash/common/keyboard/keyboard_ui.h +++ b/ash/keyboard/keyboard_ui.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_KEYBOARD_KEYBOARD_UI_H_ -#define ASH_COMMON_KEYBOARD_KEYBOARD_UI_H_ +#ifndef ASH_KEYBOARD_KEYBOARD_UI_H_ +#define ASH_KEYBOARD_KEYBOARD_UI_H_ #include <memory> @@ -47,4 +47,4 @@ } // namespace ash -#endif // ASH_COMMON_KEYBOARD_KEYBOARD_UI_H_ +#endif // ASH_KEYBOARD_KEYBOARD_UI_H_
diff --git a/ash/common/keyboard/keyboard_ui_observer.h b/ash/keyboard/keyboard_ui_observer.h similarity index 72% rename from ash/common/keyboard/keyboard_ui_observer.h rename to ash/keyboard/keyboard_ui_observer.h index a0dc241..a12305ea 100644 --- a/ash/common/keyboard/keyboard_ui_observer.h +++ b/ash/keyboard/keyboard_ui_observer.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_KEYBOARD_KEYBOARD_UI_OBSERVER_H_ -#define ASH_COMMON_KEYBOARD_KEYBOARD_UI_OBSERVER_H_ +#ifndef ASH_KEYBOARD_KEYBOARD_UI_OBSERVER_H_ +#define ASH_KEYBOARD_KEYBOARD_UI_OBSERVER_H_ #include "ash/ash_export.h" #include "base/macros.h" @@ -20,4 +20,4 @@ } // namespace ash -#endif // ASH_COMMON_KEYBOARD_KEYBOARD_UI_OBSERVER_H_ +#endif // ASH_KEYBOARD_KEYBOARD_UI_OBSERVER_H_
diff --git a/ash/common/login_status.h b/ash/login_status.h similarity index 85% rename from ash/common/login_status.h rename to ash/login_status.h index 3083d430..072c29c4 100644 --- a/ash/common/login_status.h +++ b/ash/login_status.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_LOGIN_STATUS_H_ -#define ASH_COMMON_LOGIN_STATUS_H_ +#ifndef ASH_LOGIN_STATUS_H_ +#define ASH_LOGIN_STATUS_H_ namespace ash { @@ -21,4 +21,4 @@ } // namespace ash -#endif // ASH_COMMON_LOGIN_STATUS_H_ +#endif // ASH_LOGIN_STATUS_H_
diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc index ab2a4e3..9d5cae4 100644 --- a/ash/magnifier/magnification_controller.cc +++ b/ash/magnifier/magnification_controller.cc
@@ -8,14 +8,14 @@ #include <utility> #include "ash/accelerators/accelerator_controller.h" -#include "ash/common/accessibility_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/accessibility_delegate.h" #include "ash/display/root_window_transformers.h" #include "ash/host/ash_window_tree_host.h" #include "ash/host/root_window_transformer.h" #include "ash/root_window_controller.h" #include "ash/shell.h" #include "ash/system/tray/system_tray_delegate.h" +#include "ash/wm_shell.h" #include "base/command_line.h" #include "base/synchronization/waitable_event.h" #include "base/timer/timer.h"
diff --git a/ash/magnifier/magnification_controller_unittest.cc b/ash/magnifier/magnification_controller_unittest.cc index f765700..1b9fc199 100644 --- a/ash/magnifier/magnification_controller_unittest.cc +++ b/ash/magnifier/magnification_controller_unittest.cc
@@ -4,7 +4,7 @@ #include "ash/magnifier/magnification_controller.h" -#include "ash/common/accessibility_types.h" +#include "ash/accessibility_types.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "base/strings/stringprintf.h"
diff --git a/ash/common/material_design/material_design_controller.cc b/ash/material_design/material_design_controller.cc similarity index 87% rename from ash/common/material_design/material_design_controller.cc rename to ash/material_design/material_design_controller.cc index dd8a25a..4477505 100644 --- a/ash/common/material_design/material_design_controller.cc +++ b/ash/material_design/material_design_controller.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/material_design/material_design_controller.h" +#include "ash/material_design/material_design_controller.h" #include <string>
diff --git a/ash/common/material_design/material_design_controller.h b/ash/material_design/material_design_controller.h similarity index 78% rename from ash/common/material_design/material_design_controller.h rename to ash/material_design/material_design_controller.h index baaee6a4..9b11ae7a 100644 --- a/ash/common/material_design/material_design_controller.h +++ b/ash/material_design/material_design_controller.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_ -#define ASH_COMMON_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_ +#ifndef ASH_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_ +#define ASH_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_ #include "ash/ash_export.h" #include "base/macros.h" @@ -32,4 +32,4 @@ } // namespace ash -#endif // ASH_COMMON_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_ +#endif // ASH_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_
diff --git a/ash/common/media_controller.cc b/ash/media_controller.cc similarity index 96% rename from ash/common/media_controller.cc rename to ash/media_controller.cc index 7a72fe4..6f320bff 100644 --- a/ash/common/media_controller.cc +++ b/ash/media_controller.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/media_controller.h" +#include "ash/media_controller.h" namespace ash {
diff --git a/ash/common/media_controller.h b/ash/media_controller.h similarity index 93% rename from ash/common/media_controller.h rename to ash/media_controller.h index 4a8eb1c..f0a4824 100644 --- a/ash/common/media_controller.h +++ b/ash/media_controller.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_MEDIA_CONTROLLER_H_ -#define ASH_COMMON_MEDIA_CONTROLLER_H_ +#ifndef ASH_MEDIA_CONTROLLER_H_ +#define ASH_MEDIA_CONTROLLER_H_ #include "ash/public/interfaces/media.mojom.h" #include "base/macros.h" @@ -63,4 +63,4 @@ } // namespace ash -#endif // ASH_COMMON_MEDIA_CONTROLLER_H_ +#endif // ASH_MEDIA_CONTROLLER_H_
diff --git a/ash/metrics/desktop_task_switch_metric_recorder.cc b/ash/metrics/desktop_task_switch_metric_recorder.cc index 2c0a9cc..d0dccd75 100644 --- a/ash/metrics/desktop_task_switch_metric_recorder.cc +++ b/ash/metrics/desktop_task_switch_metric_recorder.cc
@@ -4,9 +4,9 @@ #include "ash/metrics/desktop_task_switch_metric_recorder.h" -#include "ash/common/wm_shell.h" #include "ash/shell.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" #include "ui/wm/public/activation_client.h" namespace ash {
diff --git a/ash/metrics/desktop_task_switch_metric_recorder_unittest.cc b/ash/metrics/desktop_task_switch_metric_recorder_unittest.cc index 2dcf49f..05ff9dc 100644 --- a/ash/metrics/desktop_task_switch_metric_recorder_unittest.cc +++ b/ash/metrics/desktop_task_switch_metric_recorder_unittest.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "ash/common/wm_shell.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" +#include "ash/wm_shell.h" #include "base/test/user_action_tester.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/window.h"
diff --git a/ash/metrics/pointer_metrics_recorder.cc b/ash/metrics/pointer_metrics_recorder.cc index da85806..a7ba99f 100644 --- a/ash/metrics/pointer_metrics_recorder.cc +++ b/ash/metrics/pointer_metrics_recorder.cc
@@ -4,10 +4,10 @@ #include "ash/metrics/pointer_metrics_recorder.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/shared/app_types.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/metrics/histogram_macros.h" #include "ui/events/event_constants.h" #include "ui/views/widget/widget.h"
diff --git a/ash/metrics/pointer_metrics_recorder_unittest.cc b/ash/metrics/pointer_metrics_recorder_unittest.cc index be1ae6d..620554f 100644 --- a/ash/metrics/pointer_metrics_recorder_unittest.cc +++ b/ash/metrics/pointer_metrics_recorder_unittest.cc
@@ -4,12 +4,12 @@ #include "ash/metrics/pointer_metrics_recorder.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shared/app_types.h" #include "ash/test/ash_test_base.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/test/histogram_tester.h" #include "ui/events/event.h" #include "ui/views/pointer_watcher.h"
diff --git a/ash/metrics/user_metrics_recorder.cc b/ash/metrics/user_metrics_recorder.cc index 639eb1e..ca6a6b27 100644 --- a/ash/metrics/user_metrics_recorder.cc +++ b/ash/metrics/user_metrics_recorder.cc
@@ -4,12 +4,10 @@ #include "ash/metrics/user_metrics_recorder.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/metrics/desktop_task_switch_metric_recorder.h" #include "ash/metrics/pointer_metrics_recorder.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/session/session_state_delegate.h" #include "ash/shelf/shelf_delegate.h" #include "ash/shelf/shelf_item_types.h" #include "ash/shelf/shelf_model.h" @@ -19,6 +17,8 @@ #include "ash/system/tray/system_tray_delegate.h" #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h"
diff --git a/ash/metrics/user_metrics_recorder_unittest.cc b/ash/metrics/user_metrics_recorder_unittest.cc index ed228427..5a5bb9f 100644 --- a/ash/metrics/user_metrics_recorder_unittest.cc +++ b/ash/metrics/user_metrics_recorder_unittest.cc
@@ -6,14 +6,14 @@ #include <memory> -#include "ash/common/login_status.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/login_status.h" #include "ash/shelf/shelf_model.h" #include "ash/test/ash_test_base.h" #include "ash/test/test_shelf_delegate.h" #include "ash/test/test_system_tray_delegate.h" #include "ash/test/user_metrics_recorder_test_api.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/test/histogram_tester.h" #include "ui/aura/window.h"
diff --git a/ash/common/mojo_interface_factory.cc b/ash/mojo_interface_factory.cc similarity index 91% rename from ash/common/mojo_interface_factory.cc rename to ash/mojo_interface_factory.cc index 74a87496..aade52f4d 100644 --- a/ash/common/mojo_interface_factory.cc +++ b/ash/mojo_interface_factory.cc
@@ -2,24 +2,24 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/mojo_interface_factory.h" +#include "ash/mojo_interface_factory.h" #include <utility> #include "ash/accelerators/accelerator_controller.h" -#include "ash/common/cast_config_controller.h" -#include "ash/common/media_controller.h" -#include "ash/common/new_window_controller.h" -#include "ash/common/session/session_controller.h" -#include "ash/common/shell_delegate.h" -#include "ash/common/shutdown_controller.h" -#include "ash/common/wallpaper/wallpaper_controller.h" -#include "ash/common/wm_shell.h" +#include "ash/cast_config_controller.h" +#include "ash/media_controller.h" +#include "ash/new_window_controller.h" +#include "ash/session/session_controller.h" #include "ash/shelf/shelf_controller.h" +#include "ash/shell_delegate.h" +#include "ash/shutdown_controller.h" #include "ash/system/locale/locale_notification_controller.h" #include "ash/system/network/vpn_list.h" #include "ash/system/tray/system_tray_controller.h" +#include "ash/wallpaper/wallpaper_controller.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm_shell.h" #include "base/bind.h" #include "services/service_manager/public/cpp/interface_registry.h" #include "ui/app_list/presenter/app_list.h"
diff --git a/ash/common/mojo_interface_factory.h b/ash/mojo_interface_factory.h similarity index 85% rename from ash/common/mojo_interface_factory.h rename to ash/mojo_interface_factory.h index 0851eb3..4204b24c 100644 --- a/ash/common/mojo_interface_factory.h +++ b/ash/mojo_interface_factory.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_MOJO_INTERFACE_FACTORY_H_ -#define ASH_COMMON_MOJO_INTERFACE_FACTORY_H_ +#ifndef ASH_MOJO_INTERFACE_FACTORY_H_ +#define ASH_MOJO_INTERFACE_FACTORY_H_ #include "ash/ash_export.h" #include "base/macros.h" @@ -32,4 +32,4 @@ } // namespace ash -#endif // ASH_COMMON_MOJO_INTERFACE_FACTORY_H_ +#endif // ASH_MOJO_INTERFACE_FACTORY_H_
diff --git a/ash/common/multi_profile_uma.cc b/ash/multi_profile_uma.cc similarity index 97% rename from ash/common/multi_profile_uma.cc rename to ash/multi_profile_uma.cc index bcf294e..47d0ff8 100644 --- a/ash/common/multi_profile_uma.cc +++ b/ash/multi_profile_uma.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/multi_profile_uma.h" +#include "ash/multi_profile_uma.h" #include "base/metrics/histogram_macros.h"
diff --git a/ash/common/multi_profile_uma.h b/ash/multi_profile_uma.h similarity index 94% rename from ash/common/multi_profile_uma.h rename to ash/multi_profile_uma.h index 3ea654a0..69c68b74 100644 --- a/ash/common/multi_profile_uma.h +++ b/ash/multi_profile_uma.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_MULTI_PROFILE_UMA_H_ -#define ASH_COMMON_MULTI_PROFILE_UMA_H_ +#ifndef ASH_MULTI_PROFILE_UMA_H_ +#define ASH_MULTI_PROFILE_UMA_H_ #include "ash/ash_export.h" #include "base/macros.h" @@ -82,4 +82,4 @@ } // namespace ash -#endif // ASH_COMMON_MULTI_PROFILE_UMA_H_ +#endif // ASH_MULTI_PROFILE_UMA_H_
diff --git a/ash/mus/DEPS b/ash/mus/DEPS index b508aea6..274c420 100644 --- a/ash/mus/DEPS +++ b/ash/mus/DEPS
@@ -10,17 +10,7 @@ "+services/service_manager/public", "+services/tracing/public", ] -# Shelf code is being moved into //ash/common. Please ask jamescook@ or msw@ -# before adding items here. http://crbug.com/615155 specific_include_rules = { - "root_window_controller.cc": [ - "+ash/shelf/shelf_layout_manager.h", - ], - "shelf_delegate_mus.cc": [ - "+ash/shelf/shelf.h", - "+ash/shelf/shelf_widget.h", - ], - "app_launch_unittest.cc": [ "+mash/quick_launch/public", ],
diff --git a/ash/mus/accelerators/accelerator_controller_registrar.cc b/ash/mus/accelerators/accelerator_controller_registrar.cc index 4bf2c403..d22d55db 100644 --- a/ash/mus/accelerators/accelerator_controller_registrar.cc +++ b/ash/mus/accelerators/accelerator_controller_registrar.cc
@@ -8,9 +8,9 @@ #include "ash/accelerators/accelerator_controller.h" #include "ash/accelerators/accelerator_router.h" -#include "ash/common/wm_shell.h" #include "ash/mus/accelerators/accelerator_ids.h" #include "ash/mus/window_manager.h" +#include "ash/wm_shell.h" #include "base/logging.h" #include "services/ui/common/accelerator_util.h" #include "ui/base/accelerators/accelerator_history.h"
diff --git a/ash/mus/accessibility_delegate_mus.h b/ash/mus/accessibility_delegate_mus.h index a6f13813..9c4bbfd6 100644 --- a/ash/mus/accessibility_delegate_mus.h +++ b/ash/mus/accessibility_delegate_mus.h
@@ -5,7 +5,7 @@ #ifndef ASH_MUS_ACCESSIBILITY_DELEGATE_MUS_H_ #define ASH_MUS_ACCESSIBILITY_DELEGATE_MUS_H_ -#include "ash/common/default_accessibility_delegate.h" +#include "ash/default_accessibility_delegate.h" #include "base/macros.h" #include "services/ui/public/interfaces/accessibility_manager.mojom.h"
diff --git a/ash/mus/bridge/README.md b/ash/mus/bridge/README.md index 4530e1a..0b923bb 100644 --- a/ash/mus/bridge/README.md +++ b/ash/mus/bridge/README.md
@@ -1,3 +1,3 @@ -This directory contains the implementation of ash/common's porting +This directory contains the implementation of ash's porting layer in terms of aura-mus. This directory is likely to change dramatically, and perhaps go away soon. See http://crbug.com/671246.
diff --git a/ash/mus/bridge/wm_shell_mus.cc b/ash/mus/bridge/wm_shell_mus.cc index 2470cfc4c..9365524c 100644 --- a/ash/mus/bridge/wm_shell_mus.cc +++ b/ash/mus/bridge/wm_shell_mus.cc
@@ -7,12 +7,7 @@ #include <utility> #include "ash/accelerators/accelerator_controller.h" -#include "ash/common/key_event_watcher.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/shell_delegate.h" -#include "ash/common/shell_observer.h" -#include "ash/common/wallpaper/wallpaper_delegate.h" -#include "ash/common/wm_window.h" +#include "ash/key_event_watcher.h" #include "ash/mus/accelerators/accelerator_controller_delegate_mus.h" #include "ash/mus/accelerators/accelerator_controller_registrar.h" #include "ash/mus/bridge/immersive_handler_factory_mus.h" @@ -23,16 +18,21 @@ #include "ash/mus/window_manager.h" #include "ash/root_window_controller.h" #include "ash/root_window_settings.h" +#include "ash/session/session_state_delegate.h" #include "ash/shared/immersive_fullscreen_controller.h" #include "ash/shell.h" +#include "ash/shell_delegate.h" #include "ash/shell_init_params.h" +#include "ash/shell_observer.h" #include "ash/system/tray/system_tray_delegate.h" +#include "ash/wallpaper/wallpaper_delegate.h" #include "ash/wm/maximize_mode/maximize_mode_event_handler.h" #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h" #include "ash/wm/mru_window_tracker.h" #include "ash/wm/window_cycle_event_filter.h" #include "ash/wm/window_resizer.h" #include "ash/wm/window_util.h" +#include "ash/wm_window.h" #include "base/memory/ptr_util.h" #include "components/user_manager/user_info_impl.h" #include "ui/aura/mus/window_tree_client.h" @@ -49,7 +49,7 @@ namespace { -// TODO(jamescook): After ShellDelegate is ported to ash/common use +// TODO(jamescook): After ShellDelegate works with mus switching to using // ShellDelegate::CreateSessionStateDelegate() to construct the mus version // of SessionStateDelegate. class SessionStateDelegateStub : public SessionStateDelegate {
diff --git a/ash/mus/bridge/wm_shell_mus.h b/ash/mus/bridge/wm_shell_mus.h index e94d2881..fbe0af0d 100644 --- a/ash/mus/bridge/wm_shell_mus.h +++ b/ash/mus/bridge/wm_shell_mus.h
@@ -10,7 +10,7 @@ #include <memory> #include <vector> -#include "ash/common/wm_shell.h" +#include "ash/wm_shell.h" #include "base/macros.h" namespace aura {
diff --git a/ash/mus/context_menu_mus.cc b/ash/mus/context_menu_mus.cc index e53ae563..bc690ef 100644 --- a/ash/mus/context_menu_mus.cc +++ b/ash/mus/context_menu_mus.cc
@@ -4,12 +4,12 @@ #include "ash/mus/context_menu_mus.h" -#include "ash/common/wallpaper/wallpaper_controller.h" -#include "ash/common/wallpaper/wallpaper_delegate.h" -#include "ash/common/wm_shell.h" #include "ash/public/cpp/shelf_types.h" #include "ash/shelf/wm_shelf.h" #include "ash/strings/grit/ash_strings.h" +#include "ash/wallpaper/wallpaper_controller.h" +#include "ash/wallpaper/wallpaper_delegate.h" +#include "ash/wm_shell.h" namespace ash {
diff --git a/ash/mus/disconnected_app_handler.cc b/ash/mus/disconnected_app_handler.cc index 21ca7c61f..12d3c973 100644 --- a/ash/mus/disconnected_app_handler.cc +++ b/ash/mus/disconnected_app_handler.cc
@@ -4,8 +4,8 @@ #include "ash/mus/disconnected_app_handler.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/wm_window.h" #include "ui/aura/window.h" #include "ui/base/class_property.h"
diff --git a/ash/mus/frame/detached_title_area_renderer.cc b/ash/mus/frame/detached_title_area_renderer.cc index 181b3f6d..7d153b55 100644 --- a/ash/mus/frame/detached_title_area_renderer.cc +++ b/ash/mus/frame/detached_title_area_renderer.cc
@@ -4,11 +4,11 @@ #include "ash/mus/frame/detached_title_area_renderer.h" -#include "ash/common/wm_window.h" #include "ash/frame/header_view.h" #include "ash/mus/property_util.h" #include "ash/mus/window_manager.h" #include "ash/wm/window_state.h" +#include "ash/wm_window.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/transient_window_client.h" #include "ui/aura/mus/property_converter.h"
diff --git a/ash/mus/keyboard_ui_mus.cc b/ash/mus/keyboard_ui_mus.cc index 244a33a..57af280 100644 --- a/ash/mus/keyboard_ui_mus.cc +++ b/ash/mus/keyboard_ui_mus.cc
@@ -4,7 +4,7 @@ #include "ash/mus/keyboard_ui_mus.h" -#include "ash/common/keyboard/keyboard_ui_observer.h" +#include "ash/keyboard/keyboard_ui_observer.h" #include "base/memory/ptr_util.h" #include "services/service_manager/public/cpp/connector.h"
diff --git a/ash/mus/keyboard_ui_mus.h b/ash/mus/keyboard_ui_mus.h index a7e5546..682afe89 100644 --- a/ash/mus/keyboard_ui_mus.h +++ b/ash/mus/keyboard_ui_mus.h
@@ -9,7 +9,7 @@ #include <memory> -#include "ash/common/keyboard/keyboard_ui.h" +#include "ash/keyboard/keyboard_ui.h" #include "base/macros.h" #include "mojo/public/cpp/bindings/binding.h" #include "ui/keyboard/keyboard.mojom.h"
diff --git a/ash/mus/move_event_handler.cc b/ash/mus/move_event_handler.cc index 74305653..a0a1912 100644 --- a/ash/mus/move_event_handler.cc +++ b/ash/mus/move_event_handler.cc
@@ -4,8 +4,8 @@ #include "ash/mus/move_event_handler.h" -#include "ash/common/wm_window.h" #include "ash/mus/bridge/workspace_event_handler_mus.h" +#include "ash/wm_window.h" #include "services/ui/public/interfaces/cursor.mojom.h" #include "ui/aura/mus/window_manager_delegate.h" #include "ui/aura/window.h"
diff --git a/ash/mus/network_connect_delegate_mus.cc b/ash/mus/network_connect_delegate_mus.cc index c28ac5da..69e7f8cc 100644 --- a/ash/mus/network_connect_delegate_mus.cc +++ b/ash/mus/network_connect_delegate_mus.cc
@@ -4,8 +4,8 @@ #include "ash/mus/network_connect_delegate_mus.h" -#include "ash/common/wm_shell.h" #include "ash/system/tray/system_tray_controller.h" +#include "ash/wm_shell.h" #include "base/logging.h" namespace ash {
diff --git a/ash/mus/non_client_frame_controller.cc b/ash/mus/non_client_frame_controller.cc index 06442090..e3620c00 100644 --- a/ash/mus/non_client_frame_controller.cc +++ b/ash/mus/non_client_frame_controller.cc
@@ -10,9 +10,8 @@ #include <string> #include <vector> -#include "ash/common/ash_constants.h" -#include "ash/common/ash_layout_constants.h" -#include "ash/common/wm_window.h" +#include "ash/ash_constants.h" +#include "ash/ash_layout_constants.h" #include "ash/frame/custom_frame_view_ash.h" #include "ash/mus/frame/custom_frame_view_mus.h" #include "ash/mus/frame/detached_title_area_renderer.h" @@ -23,6 +22,7 @@ #include "ash/shared/immersive_fullscreen_controller_delegate.h" #include "ash/wm/panels/panel_frame_view.h" #include "ash/wm/window_properties.h" +#include "ash/wm_window.h" #include "base/macros.h" #include "base/memory/ptr_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/ash/mus/screen_mus.cc b/ash/mus/screen_mus.cc index 4785d7d..b07ae87 100644 --- a/ash/mus/screen_mus.cc +++ b/ash/mus/screen_mus.cc
@@ -4,8 +4,8 @@ #include "ash/mus/screen_mus.h" -#include "ash/common/wm_window.h" #include "ash/wm/root_window_finder.h" +#include "ash/wm_window.h" #include "services/ui/public/interfaces/display/display_controller.mojom.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/env.h"
diff --git a/ash/mus/shelf_delegate_mus.cc b/ash/mus/shelf_delegate_mus.cc index 4b8ba01..1571d755 100644 --- a/ash/mus/shelf_delegate_mus.cc +++ b/ash/mus/shelf_delegate_mus.cc
@@ -4,8 +4,8 @@ #include "ash/mus/shelf_delegate_mus.h" -#include "ash/common/wm_shell.h" #include "ash/shelf/shelf_controller.h" +#include "ash/wm_shell.h" #include "base/strings/string_util.h" namespace ash {
diff --git a/ash/mus/shell_delegate_mus.cc b/ash/mus/shell_delegate_mus.cc index 2f17564..4354f8c3 100644 --- a/ash/mus/shell_delegate_mus.cc +++ b/ash/mus/shell_delegate_mus.cc
@@ -6,15 +6,15 @@ #include <utility> -#include "ash/common/gpu_support_stub.h" -#include "ash/common/palette_delegate.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/gpu_support_stub.h" #include "ash/mus/accessibility_delegate_mus.h" #include "ash/mus/context_menu_mus.h" #include "ash/mus/shelf_delegate_mus.h" #include "ash/mus/system_tray_delegate_mus.h" #include "ash/mus/wallpaper_delegate_mus.h" +#include "ash/palette_delegate.h" +#include "ash/session/session_state_delegate.h" +#include "ash/wm_shell.h" #include "base/memory/ptr_util.h" #include "base/strings/string16.h" #include "base/strings/string_util.h"
diff --git a/ash/mus/shell_delegate_mus.h b/ash/mus/shell_delegate_mus.h index 922a23f..c66ac31 100644 --- a/ash/mus/shell_delegate_mus.h +++ b/ash/mus/shell_delegate_mus.h
@@ -7,7 +7,7 @@ #include <memory> -#include "ash/common/shell_delegate.h" +#include "ash/shell_delegate.h" #include "base/macros.h" namespace service_manager {
diff --git a/ash/mus/test/ash_test_impl_mus.cc b/ash/mus/test/ash_test_impl_mus.cc index 2aa95e1..e7ae95f 100644 --- a/ash/mus/test/ash_test_impl_mus.cc +++ b/ash/mus/test/ash_test_impl_mus.cc
@@ -4,8 +4,8 @@ #include "ash/mus/test/ash_test_impl_mus.h" -#include "ash/common/wm_window.h" #include "ash/test/ash_test.h" +#include "ash/wm_window.h" #include "base/memory/ptr_util.h" #include "services/ui/public/cpp/property_type_converters.h" #include "services/ui/public/interfaces/window_manager.mojom.h"
diff --git a/ash/mus/test/wm_test_base.cc b/ash/mus/test/wm_test_base.cc index 487a1caa..e9bd0fa9 100644 --- a/ash/mus/test/wm_test_base.cc +++ b/ash/mus/test/wm_test_base.cc
@@ -7,15 +7,15 @@ #include <algorithm> #include <vector> -#include "ash/common/session/session_controller.h" -#include "ash/common/wm_shell.h" #include "ash/mus/test/wm_test_helper.h" #include "ash/mus/top_level_window_factory.h" #include "ash/mus/window_manager.h" #include "ash/mus/window_manager_application.h" #include "ash/public/cpp/session_types.h" #include "ash/public/interfaces/session_controller.mojom.h" +#include "ash/session/session_controller.h" #include "ash/test/wm_window_test_api.h" +#include "ash/wm_shell.h" #include "base/memory/ptr_util.h" #include "services/ui/public/cpp/property_type_converters.h" #include "ui/aura/mus/property_converter.h"
diff --git a/ash/mus/test/wm_test_helper.cc b/ash/mus/test/wm_test_helper.cc index d079535..8045fdb 100644 --- a/ash/mus/test/wm_test_helper.cc +++ b/ash/mus/test/wm_test_helper.cc
@@ -4,13 +4,13 @@ #include "ash/mus/test/wm_test_helper.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/mus/screen_mus.h" #include "ash/mus/window_manager.h" #include "ash/mus/window_manager_application.h" #include "ash/test/test_shell_delegate.h" #include "ash/test/wm_shell_test_api.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/memory/ptr_util.h" #include "base/message_loop/message_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/ash/mus/top_level_window_factory.cc b/ash/mus/top_level_window_factory.cc index cdcc9e2..0173086f 100644 --- a/ash/mus/top_level_window_factory.cc +++ b/ash/mus/top_level_window_factory.cc
@@ -4,8 +4,6 @@ #include "ash/mus/top_level_window_factory.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/mus/disconnected_app_handler.h" #include "ash/mus/frame/detached_title_area_renderer.h" #include "ash/mus/non_client_frame_controller.h" @@ -16,6 +14,8 @@ #include "ash/root_window_settings.h" #include "ash/wm/container_finder.h" #include "ash/wm/window_state.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "mojo/public/cpp/bindings/type_converter.h" #include "services/ui/public/cpp/property_type_converters.h" #include "services/ui/public/interfaces/window_manager.mojom.h"
diff --git a/ash/mus/top_level_window_factory_unittest.cc b/ash/mus/top_level_window_factory_unittest.cc index c4b03e1a..5270398 100644 --- a/ash/mus/top_level_window_factory_unittest.cc +++ b/ash/mus/top_level_window_factory_unittest.cc
@@ -10,14 +10,14 @@ #include <string> #include <vector> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/mus/test/wm_test_base.h" #include "ash/mus/window_manager.h" #include "ash/mus/window_manager_application.h" #include "ash/test/ash_test.h" #include "ash/test/ash_test_base.h" #include "ash/test/ash_test_helper.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/aura/window.h" #include "ui/display/screen.h"
diff --git a/ash/mus/wallpaper_delegate_mus.h b/ash/mus/wallpaper_delegate_mus.h index 6b03d1ab..5bbd55d 100644 --- a/ash/mus/wallpaper_delegate_mus.h +++ b/ash/mus/wallpaper_delegate_mus.h
@@ -5,7 +5,7 @@ #ifndef ASH_MUS_WALLPAPER_DELEGATE_MUS_H_ #define ASH_MUS_WALLPAPER_DELEGATE_MUS_H_ -#include "ash/common/wallpaper/wallpaper_delegate.h" +#include "ash/wallpaper/wallpaper_delegate.h" #include "base/macros.h" namespace ash {
diff --git a/ash/mus/window_manager.cc b/ash/mus/window_manager.cc index 61338662..3d181dcd 100644 --- a/ash/mus/window_manager.cc +++ b/ash/mus/window_manager.cc
@@ -8,8 +8,6 @@ #include <utility> -#include "ash/common/session/session_controller.h" -#include "ash/common/wm_window.h" #include "ash/mus/accelerators/accelerator_handler.h" #include "ash/mus/accelerators/accelerator_ids.h" #include "ash/mus/bridge/wm_shell_mus.h" @@ -25,11 +23,13 @@ #include "ash/public/cpp/window_properties.h" #include "ash/root_window_controller.h" #include "ash/root_window_settings.h" +#include "ash/session/session_controller.h" #include "ash/shell.h" #include "ash/shell_init_params.h" #include "ash/wm/ash_focus_rules.h" #include "ash/wm/container_finder.h" #include "ash/wm/window_state.h" +#include "ash/wm_window.h" #include "base/memory/ptr_util.h" #include "base/threading/sequenced_worker_pool.h" #include "services/service_manager/public/cpp/connector.h"
diff --git a/ash/mus/window_manager_application.cc b/ash/mus/window_manager_application.cc index b8a9b91b..2d7291e 100644 --- a/ash/mus/window_manager_application.cc +++ b/ash/mus/window_manager_application.cc
@@ -6,11 +6,11 @@ #include <utility> -#include "ash/common/mojo_interface_factory.h" -#include "ash/common/wm_shell.h" +#include "ash/mojo_interface_factory.h" #include "ash/mus/network_connect_delegate_mus.h" #include "ash/mus/window_manager.h" #include "ash/system/power/power_status.h" +#include "ash/wm_shell.h" #include "base/bind.h" #include "base/memory/ptr_util.h" #include "base/threading/sequenced_worker_pool.h"
diff --git a/ash/common/mus_property_mirror_ash_unittest.cc b/ash/mus_property_mirror_ash_unittest.cc similarity index 98% rename from ash/common/mus_property_mirror_ash_unittest.cc rename to ash/mus_property_mirror_ash_unittest.cc index a869e86..30a5b8e 100644 --- a/ash/common/mus_property_mirror_ash_unittest.cc +++ b/ash/mus_property_mirror_ash_unittest.cc
@@ -6,9 +6,9 @@ #include <string> -#include "ash/common/wm_window.h" #include "ash/public/cpp/window_properties.h" #include "ash/test/ash_test.h" +#include "ash/wm_window.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "ui/aura/client/aura_constants.h"
diff --git a/ash/common/new_window_controller.cc b/ash/new_window_controller.cc similarity index 96% rename from ash/common/new_window_controller.cc rename to ash/new_window_controller.cc index f316e9c7..b791c82a 100644 --- a/ash/common/new_window_controller.cc +++ b/ash/new_window_controller.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/new_window_controller.h" +#include "ash/new_window_controller.h" #include <utility>
diff --git a/ash/common/new_window_controller.h b/ash/new_window_controller.h similarity index 91% rename from ash/common/new_window_controller.h rename to ash/new_window_controller.h index 32e262a..80097f32 100644 --- a/ash/common/new_window_controller.h +++ b/ash/new_window_controller.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_NEW_WINDOW_CONTROLLER_H_ -#define ASH_COMMON_NEW_WINDOW_CONTROLLER_H_ +#ifndef ASH_NEW_WINDOW_CONTROLLER_H_ +#define ASH_NEW_WINDOW_CONTROLLER_H_ #include "ash/public/interfaces/new_window.mojom.h" #include "base/macros.h" @@ -47,4 +47,4 @@ } // namespace ash -#endif // ASH_COMMON_NEW_WINDOW_CONTROLLER_H_ +#endif // ASH_NEW_WINDOW_CONTROLLER_H_
diff --git a/ash/common/palette_delegate.h b/ash/palette_delegate.h similarity index 93% rename from ash/common/palette_delegate.h rename to ash/palette_delegate.h index 9ebfe242..942f09e 100644 --- a/ash/common/palette_delegate.h +++ b/ash/palette_delegate.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_PALETTE_DELEGATE_H_ -#define ASH_COMMON_PALETTE_DELEGATE_H_ +#ifndef ASH_PALETTE_DELEGATE_H_ +#define ASH_PALETTE_DELEGATE_H_ #include "ash/ash_export.h" #include "base/callback.h" @@ -60,4 +60,4 @@ } // namespace ash -#endif // ASH_COMMON_PALETTE_DELEGATE_H_ +#endif // ASH_PALETTE_DELEGATE_H_
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index a4ffb45..c3387a10 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc
@@ -8,35 +8,33 @@ #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/shell_delegate.h" -#include "ash/common/wallpaper/wallpaper_delegate.h" -#include "ash/common/wallpaper/wallpaper_widget_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" @@ -58,6 +56,8 @@ #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"
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h index 43357016..5c84f434 100644 --- a/ash/root_window_controller.h +++ b/ash/root_window_controller.h
@@ -10,8 +10,8 @@ #include <vector> #include "ash/ash_export.h" -#include "ash/common/shell_observer.h" #include "ash/public/cpp/shelf_types.h" +#include "ash/shell_observer.h" #include "ash/wm/workspace/workspace_types.h" #include "base/macros.h" #include "ui/aura/window.h"
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc index 3e4eb29e..06f6b682 100644 --- a/ash/root_window_controller_unittest.cc +++ b/ash/root_window_controller_unittest.cc
@@ -6,11 +6,9 @@ #include <memory> -#include "ash/common/session/session_controller.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/session/session_controller.h" +#include "ash/session/session_state_delegate.h" #include "ash/shell.h" #include "ash/system/tray/system_tray_delegate.h" #include "ash/test/ash_test_base.h" @@ -19,6 +17,8 @@ #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "ui/aura/client/focus_change_observer.h" #include "ui/aura/client/focus_client.h"
diff --git a/ash/common/scoped_root_window_for_new_windows.cc b/ash/scoped_root_window_for_new_windows.cc similarity index 85% rename from ash/common/scoped_root_window_for_new_windows.cc rename to ash/scoped_root_window_for_new_windows.cc index 28e24f00..06440b6 100644 --- a/ash/common/scoped_root_window_for_new_windows.cc +++ b/ash/scoped_root_window_for_new_windows.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/scoped_root_window_for_new_windows.h" +#include "ash/scoped_root_window_for_new_windows.h" -#include "ash/common/wm_shell.h" +#include "ash/wm_shell.h" #include "base/logging.h" namespace ash {
diff --git a/ash/common/scoped_root_window_for_new_windows.h b/ash/scoped_root_window_for_new_windows.h similarity index 82% rename from ash/common/scoped_root_window_for_new_windows.h rename to ash/scoped_root_window_for_new_windows.h index fd0f49a8..ac0946af 100644 --- a/ash/common/scoped_root_window_for_new_windows.h +++ b/ash/scoped_root_window_for_new_windows.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SCOPED_ROOT_WINDOW_FOR_NEW_WINDOWS_H_ -#define ASH_COMMON_SCOPED_ROOT_WINDOW_FOR_NEW_WINDOWS_H_ +#ifndef ASH_SCOPED_ROOT_WINDOW_FOR_NEW_WINDOWS_H_ +#define ASH_SCOPED_ROOT_WINDOW_FOR_NEW_WINDOWS_H_ #include "ash/ash_export.h" #include "base/macros.h" @@ -28,4 +28,4 @@ } // namespace ash -#endif // ASH_COMMON_SCOPED_ROOT_WINDOW_FOR_NEW_WINDOWS_H_ +#endif // ASH_SCOPED_ROOT_WINDOW_FOR_NEW_WINDOWS_H_
diff --git a/ash/screen_util_unittest.cc b/ash/screen_util_unittest.cc index 9646cbaa..d60faa8a 100644 --- a/ash/screen_util_unittest.cc +++ b/ash/screen_util_unittest.cc
@@ -4,12 +4,12 @@ #include "ash/screen_util.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/wm/window_util.h" #include "ash/wm/wm_screen_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/aura/env.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h"
diff --git a/ash/common/session/session_controller.cc b/ash/session/session_controller.cc similarity index 97% rename from ash/common/session/session_controller.cc rename to ash/session/session_controller.cc index cafed50..1a12514 100644 --- a/ash/common/session/session_controller.cc +++ b/ash/session/session_controller.cc
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/session/session_controller.h" +#include "ash/session/session_controller.h" #include <algorithm> -#include "ash/common/session/session_state_observer.h" +#include "ash/session/session_state_observer.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "components/signin/core/account_id/account_id.h"
diff --git a/ash/common/session/session_controller.h b/ash/session/session_controller.h similarity index 96% rename from ash/common/session/session_controller.h rename to ash/session/session_controller.h index 99d0daf..43cca61 100644 --- a/ash/common/session/session_controller.h +++ b/ash/session/session_controller.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SESSION_SESSION_CONTROLLER_H_ -#define ASH_COMMON_SESSION_SESSION_CONTROLLER_H_ +#ifndef ASH_SESSION_SESSION_CONTROLLER_H_ +#define ASH_SESSION_SESSION_CONTROLLER_H_ #include <stdint.h> @@ -125,4 +125,4 @@ } // namespace ash -#endif // ASH_COMMON_SESSION_SESSION_CONTROLLER_H_ +#endif // ASH_SESSION_SESSION_CONTROLLER_H_
diff --git a/ash/common/session/session_controller_unittest.cc b/ash/session/session_controller_unittest.cc similarity index 97% rename from ash/common/session/session_controller_unittest.cc rename to ash/session/session_controller_unittest.cc index e5eb8f4..d4fc491 100644 --- a/ash/common/session/session_controller_unittest.cc +++ b/ash/session/session_controller_unittest.cc
@@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/session/session_controller.h" +#include "ash/session/session_controller.h" #include <memory> #include <string> #include <utility> #include <vector> -#include "ash/common/session/session_controller.h" -#include "ash/common/session/session_state_observer.h" #include "ash/public/interfaces/session_controller.mojom.h" +#include "ash/session/session_controller.h" +#include "ash/session/session_state_observer.h" #include "base/macros.h" #include "base/memory/ptr_util.h" #include "components/user_manager/user_type.h"
diff --git a/ash/common/session/session_state_delegate.cc b/ash/session/session_state_delegate.cc similarity index 92% rename from ash/common/session/session_state_delegate.cc rename to ash/session/session_state_delegate.cc index b4be363..1629431 100644 --- a/ash/common/session/session_state_delegate.cc +++ b/ash/session/session_state_delegate.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/session/session_state_delegate.h" +#include "ash/session/session_state_delegate.h" namespace ash {
diff --git a/ash/common/session/session_state_delegate.h b/ash/session/session_state_delegate.h similarity index 95% rename from ash/common/session/session_state_delegate.h rename to ash/session/session_state_delegate.h index 166b20f..e6c71038 100644 --- a/ash/common/session/session_state_delegate.h +++ b/ash/session/session_state_delegate.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SESSION_SESSION_STATE_DELEGATE_H_ -#define ASH_COMMON_SESSION_SESSION_STATE_DELEGATE_H_ +#ifndef ASH_SESSION_SESSION_STATE_DELEGATE_H_ +#define ASH_SESSION_SESSION_STATE_DELEGATE_H_ #include "ash/ash_export.h" #include "ash/public/cpp/session_types.h" @@ -102,4 +102,4 @@ } // namespace ash -#endif // ASH_COMMON_SESSION_SESSION_STATE_DELEGATE_H_ +#endif // ASH_SESSION_SESSION_STATE_DELEGATE_H_
diff --git a/ash/common/session/session_state_observer.cc b/ash/session/session_state_observer.cc similarity index 80% rename from ash/common/session/session_state_observer.cc rename to ash/session/session_state_observer.cc index 27bbe9d8..29468c2 100644 --- a/ash/common/session/session_state_observer.cc +++ b/ash/session/session_state_observer.cc
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/session/session_state_observer.h" +#include "ash/session/session_state_observer.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/session/session_state_delegate.h" +#include "ash/wm_shell.h" namespace ash {
diff --git a/ash/common/session/session_state_observer.h b/ash/session/session_state_observer.h similarity index 87% rename from ash/common/session/session_state_observer.h rename to ash/session/session_state_observer.h index 99bdb42..4ff2d26 100644 --- a/ash/common/session/session_state_observer.h +++ b/ash/session/session_state_observer.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SESSION_SESSION_STATE_OBSERVER_H_ -#define ASH_COMMON_SESSION_SESSION_STATE_OBSERVER_H_ +#ifndef ASH_SESSION_SESSION_STATE_OBSERVER_H_ +#define ASH_SESSION_SESSION_STATE_OBSERVER_H_ #include "ash/ash_export.h" #include "base/macros.h" @@ -42,4 +42,4 @@ } // namespace ash -#endif // ASH_COMMON_SESSION_SESSION_STATE_OBSERVER_H_ +#endif // ASH_SESSION_SESSION_STATE_OBSERVER_H_
diff --git a/ash/shelf/app_list_button.cc b/ash/shelf/app_list_button.cc index 6d2fb33..49ac3a3 100644 --- a/ash/shelf/app_list_button.cc +++ b/ash/shelf/app_list_button.cc
@@ -4,7 +4,6 @@ #include "ash/shelf/app_list_button.h" -#include "ash/common/wm_shell.h" #include "ash/public/cpp/shelf_types.h" #include "ash/shelf/ink_drop_button_listener.h" #include "ash/shelf/shelf_constants.h" @@ -12,6 +11,7 @@ #include "ash/shelf/wm_shelf.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/tray/tray_popup_utils.h" +#include "ash/wm_shell.h" #include "base/memory/ptr_util.h" #include "ui/accessibility/ax_node_data.h" #include "ui/base/l10n/l10n_util.h"
diff --git a/ash/shelf/app_list_shelf_item_delegate.cc b/ash/shelf/app_list_shelf_item_delegate.cc index b2ba8a2..e05580d9 100644 --- a/ash/shelf/app_list_shelf_item_delegate.cc +++ b/ash/shelf/app_list_shelf_item_delegate.cc
@@ -4,9 +4,9 @@ #include "ash/shelf/app_list_shelf_item_delegate.h" -#include "ash/common/wm_shell.h" #include "ash/shelf/shelf_model.h" #include "ash/strings/grit/ash_strings.h" +#include "ash/wm_shell.h" #include "base/memory/ptr_util.h" #include "ui/app_list/app_list_switches.h" #include "ui/base/l10n/l10n_util.h"
diff --git a/ash/shelf/overflow_bubble.cc b/ash/shelf/overflow_bubble.cc index 2f09f860..df72d2d4 100644 --- a/ash/shelf/overflow_bubble.cc +++ b/ash/shelf/overflow_bubble.cc
@@ -4,12 +4,12 @@ #include "ash/shelf/overflow_bubble.h" -#include "ash/common/wm_shell.h" #include "ash/shelf/overflow_bubble_view.h" #include "ash/shelf/overflow_button.h" #include "ash/shelf/shelf_view.h" #include "ash/shelf/wm_shelf.h" #include "ash/system/tray/tray_background_view.h" +#include "ash/wm_shell.h" #include "ui/gfx/geometry/rect.h" #include "ui/views/widget/widget.h"
diff --git a/ash/shelf/overflow_bubble_view.cc b/ash/shelf/overflow_bubble_view.cc index 80d8f09..bb14b0ec 100644 --- a/ash/shelf/overflow_bubble_view.cc +++ b/ash/shelf/overflow_bubble_view.cc
@@ -6,11 +6,11 @@ #include <algorithm> -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/shelf/shelf_constants.h" #include "ash/shelf/wm_shelf.h" +#include "ash/wm_window.h" #include "ui/display/display.h" #include "ui/display/screen.h" #include "ui/events/event.h"
diff --git a/ash/shelf/shelf_alignment_menu.cc b/ash/shelf/shelf_alignment_menu.cc index 5429b4e..0360e49 100644 --- a/ash/shelf/shelf_alignment_menu.cc +++ b/ash/shelf/shelf_alignment_menu.cc
@@ -4,11 +4,11 @@ #include "ash/shelf/shelf_alignment_menu.h" -#include "ash/common/wm_shell.h" #include "ash/metrics/user_metrics_action.h" #include "ash/public/cpp/shelf_types.h" #include "ash/shelf/wm_shelf.h" #include "ash/strings/grit/ash_strings.h" +#include "ash/wm_shell.h" namespace ash {
diff --git a/ash/shelf/shelf_background_animator.cc b/ash/shelf/shelf_background_animator.cc index 00b3347c..c640d0e 100644 --- a/ash/shelf/shelf_background_animator.cc +++ b/ash/shelf/shelf_background_animator.cc
@@ -7,10 +7,10 @@ #include <algorithm> #include "ash/animation/animation_change_type.h" -#include "ash/common/wallpaper/wallpaper_controller.h" #include "ash/shelf/shelf_background_animator_observer.h" #include "ash/shelf/shelf_constants.h" #include "ash/shelf/wm_shelf.h" +#include "ash/wallpaper/wallpaper_controller.h" #include "ui/gfx/animation/slide_animation.h" #include "ui/gfx/color_utils.h"
diff --git a/ash/shelf/shelf_background_animator.h b/ash/shelf/shelf_background_animator.h index a12fe842..892d3ce 100644 --- a/ash/shelf/shelf_background_animator.h +++ b/ash/shelf/shelf_background_animator.h
@@ -9,9 +9,9 @@ #include <vector> #include "ash/ash_export.h" -#include "ash/common/wallpaper/wallpaper_controller_observer.h" #include "ash/public/cpp/shelf_types.h" #include "ash/shelf/wm_shelf_observer.h" +#include "ash/wallpaper/wallpaper_controller_observer.h" #include "base/macros.h" #include "base/observer_list.h" #include "third_party/skia/include/core/SkColor.h"
diff --git a/ash/shelf/shelf_background_animator_unittest.cc b/ash/shelf/shelf_background_animator_unittest.cc index 5431ca6a..03bff0b 100644 --- a/ash/shelf/shelf_background_animator_unittest.cc +++ b/ash/shelf/shelf_background_animator_unittest.cc
@@ -7,10 +7,10 @@ #include <memory> #include "ash/animation/animation_change_type.h" -#include "ash/common/wallpaper/wallpaper_controller.h" -#include "ash/common/wm_shell.h" #include "ash/shelf/shelf_background_animator_observer.h" #include "ash/shelf/shelf_constants.h" +#include "ash/wallpaper/wallpaper_controller.h" +#include "ash/wm_shell.h" #include "base/bind.h" #include "base/macros.h" #include "base/test/test_mock_time_task_runner.h"
diff --git a/ash/shelf/shelf_button.cc b/ash/shelf/shelf_button.cc index bcd86583..ae40c6ec 100644 --- a/ash/shelf/shelf_button.cc +++ b/ash/shelf/shelf_button.cc
@@ -6,7 +6,7 @@ #include <algorithm> -#include "ash/common/ash_constants.h" +#include "ash/ash_constants.h" #include "ash/shelf/ink_drop_button_listener.h" #include "ash/shelf/shelf_constants.h" #include "ash/shelf/shelf_view.h"
diff --git a/ash/shelf/shelf_button_pressed_metric_tracker.cc b/ash/shelf/shelf_button_pressed_metric_tracker.cc index 0724cf6..e4973d4 100644 --- a/ash/shelf/shelf_button_pressed_metric_tracker.cc +++ b/ash/shelf/shelf_button_pressed_metric_tracker.cc
@@ -4,7 +4,7 @@ #include "ash/shelf/shelf_button_pressed_metric_tracker.h" -#include "ash/common/wm_shell.h" +#include "ash/wm_shell.h" #include "base/metrics/histogram_macros.h" #include "base/time/default_tick_clock.h" #include "ui/views/controls/button/button.h"
diff --git a/ash/shelf/shelf_button_pressed_metric_tracker_unittest.cc b/ash/shelf/shelf_button_pressed_metric_tracker_unittest.cc index 1cc2879..47ea523 100644 --- a/ash/shelf/shelf_button_pressed_metric_tracker_unittest.cc +++ b/ash/shelf/shelf_button_pressed_metric_tracker_unittest.cc
@@ -6,11 +6,11 @@ #include <utility> -#include "ash/common/wm_shell.h" #include "ash/shelf/wm_shelf.h" #include "ash/test/ash_test_base.h" #include "ash/test/shelf_button_pressed_metric_tracker_test_api.h" #include "ash/test/shelf_view_test_api.h" +#include "ash/wm_shell.h" #include "base/macros.h" #include "base/test/histogram_tester.h" #include "base/test/simple_test_tick_clock.h"
diff --git a/ash/shelf/shelf_controller.cc b/ash/shelf/shelf_controller.cc index 4a0130d..f76ed4b6 100644 --- a/ash/shelf/shelf_controller.cc +++ b/ash/shelf/shelf_controller.cc
@@ -4,12 +4,12 @@ #include "ash/shelf/shelf_controller.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/root_window_controller.h" #include "ash/shelf/shelf_item_delegate.h" #include "ash/shelf/wm_shelf.h" #include "ash/shell.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/strings/utf_string_conversions.h" #include "ui/base/models/simple_menu_model.h" #include "ui/base/resource/resource_bundle.h"
diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc index fcd8036c..df1aa222 100644 --- a/ash/shelf/shelf_layout_manager.cc +++ b/ash/shelf/shelf_layout_manager.cc
@@ -9,12 +9,10 @@ #include <vector> #include "ash/animation/animation_change_type.h" -#include "ash/common/session/session_controller.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.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/shelf_constants.h" #include "ash/shelf/shelf_layout_manager_observer.h" #include "ash/shelf/shelf_widget.h" @@ -24,6 +22,8 @@ #include "ash/wm/mru_window_tracker.h" #include "ash/wm/window_state.h" #include "ash/wm/wm_screen_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/auto_reset.h" #include "base/command_line.h" #include "base/i18n/rtl.h"
diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h index 505cf0e..9ff211b 100644 --- a/ash/shelf/shelf_layout_manager.h +++ b/ash/shelf/shelf_layout_manager.h
@@ -8,15 +8,15 @@ #include <memory> #include "ash/ash_export.h" -#include "ash/common/session/session_state_observer.h" -#include "ash/common/shell_observer.h" -#include "ash/common/wm_activation_observer.h" #include "ash/public/cpp/shelf_types.h" +#include "ash/session/session_state_observer.h" #include "ash/shelf/wm_shelf.h" +#include "ash/shell_observer.h" #include "ash/wm/dock/docked_window_layout_manager_observer.h" #include "ash/wm/lock_state_observer.h" #include "ash/wm/wm_snap_to_pixel_layout_manager.h" #include "ash/wm/workspace/workspace_types.h" +#include "ash/wm_activation_observer.h" #include "base/macros.h" #include "base/observer_list.h" #include "base/timer/timer.h"
diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc index cb32ca3..8f4214d5 100644 --- a/ash/shelf/shelf_layout_manager_unittest.cc +++ b/ash/shelf/shelf_layout_manager_unittest.cc
@@ -6,12 +6,10 @@ #include "ash/accelerators/accelerator_controller.h" #include "ash/accelerators/accelerator_table.h" -#include "ash/common/focus_cycler.h" -#include "ash/common/session/session_controller.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/focus_cycler.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/session/session_controller.h" #include "ash/shelf/shelf_constants.h" #include "ash/shelf/shelf_layout_manager_observer.h" #include "ash/shelf/shelf_view.h" @@ -28,6 +26,8 @@ #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h"
diff --git a/ash/shelf/shelf_locking_manager.cc b/ash/shelf/shelf_locking_manager.cc index 362eedc..6505f83 100644 --- a/ash/shelf/shelf_locking_manager.cc +++ b/ash/shelf/shelf_locking_manager.cc
@@ -4,9 +4,9 @@ #include "ash/shelf/shelf_locking_manager.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/session/session_state_delegate.h" #include "ash/shelf/wm_shelf.h" +#include "ash/wm_shell.h" namespace ash {
diff --git a/ash/shelf/shelf_locking_manager.h b/ash/shelf/shelf_locking_manager.h index b40e2bb..8aee6b08 100644 --- a/ash/shelf/shelf_locking_manager.h +++ b/ash/shelf/shelf_locking_manager.h
@@ -6,9 +6,9 @@ #define ASH_SHELF_SHELF_LOCKING_MANAGER_H_ #include "ash/ash_export.h" -#include "ash/common/session/session_state_observer.h" -#include "ash/common/shell_observer.h" #include "ash/public/cpp/shelf_types.h" +#include "ash/session/session_state_observer.h" +#include "ash/shell_observer.h" #include "ash/wm/lock_state_observer.h" namespace ash {
diff --git a/ash/shelf/shelf_locking_manager_unittest.cc b/ash/shelf/shelf_locking_manager_unittest.cc index 7d57160e..3af05cac 100644 --- a/ash/shelf/shelf_locking_manager_unittest.cc +++ b/ash/shelf/shelf_locking_manager_unittest.cc
@@ -4,7 +4,7 @@ #include "ash/shelf/shelf_locking_manager.h" -#include "ash/common/session/session_state_delegate.h" +#include "ash/session/session_state_delegate.h" #include "ash/shelf/wm_shelf.h" #include "ash/test/ash_test_base.h"
diff --git a/ash/shelf/shelf_tooltip_manager.cc b/ash/shelf/shelf_tooltip_manager.cc index 59988c8..0f3a8758 100644 --- a/ash/shelf/shelf_tooltip_manager.cc +++ b/ash/shelf/shelf_tooltip_manager.cc
@@ -4,13 +4,13 @@ #include "ash/shelf/shelf_tooltip_manager.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/shelf/shelf_view.h" #include "ash/shelf/wm_shelf.h" #include "ash/system/tray/tray_constants.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/bind.h" #include "base/strings/string16.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/ash/shelf/shelf_tooltip_manager_unittest.cc b/ash/shelf/shelf_tooltip_manager_unittest.cc index 9f308d3..8f098a9 100644 --- a/ash/shelf/shelf_tooltip_manager_unittest.cc +++ b/ash/shelf/shelf_tooltip_manager_unittest.cc
@@ -4,7 +4,6 @@ #include "ash/shelf/shelf_tooltip_manager.h" -#include "ash/common/wm_shell.h" #include "ash/shelf/app_list_button.h" #include "ash/shelf/shelf_model.h" #include "ash/shelf/shelf_view.h" @@ -12,6 +11,7 @@ #include "ash/test/ash_test_base.h" #include "ash/test/shelf_view_test_api.h" #include "ash/test/test_shelf_item_delegate.h" +#include "ash/wm_shell.h" #include "base/memory/ptr_util.h" #include "ui/events/event_constants.h" #include "ui/events/test/event_generator.h"
diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc index 95e8ced..1a194f24 100644 --- a/ash/shelf/shelf_view.cc +++ b/ash/shelf/shelf_view.cc
@@ -7,12 +7,9 @@ #include <algorithm> #include <memory> -#include "ash/common/ash_constants.h" -#include "ash/common/scoped_root_window_for_new_windows.h" -#include "ash/common/shell_delegate.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/ash_constants.h" #include "ash/drag_drop/drag_image_view.h" +#include "ash/scoped_root_window_for_new_windows.h" #include "ash/shelf/app_list_button.h" #include "ash/shelf/overflow_bubble.h" #include "ash/shelf/overflow_bubble_view.h" @@ -24,8 +21,11 @@ #include "ash/shelf/shelf_model.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/wm/root_window_finder.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/auto_reset.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h"
diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc index e2716f91..cd6882c0 100644 --- a/ash/shelf/shelf_view_unittest.cc +++ b/ash/shelf/shelf_view_unittest.cc
@@ -9,8 +9,6 @@ #include <utility> #include <vector> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/shelf/app_list_button.h" @@ -34,6 +32,8 @@ #include "ash/test/test_shelf_item_delegate.h" #include "ash/test/test_shell_delegate.h" #include "ash/test/test_system_tray_delegate.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/i18n/rtl.h" #include "base/macros.h" #include "base/memory/ptr_util.h"
diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc index 8568cea6..b14169c 100644 --- a/ash/shelf/shelf_widget.cc +++ b/ash/shelf/shelf_widget.cc
@@ -5,11 +5,9 @@ #include "ash/shelf/shelf_widget.h" #include "ash/animation/animation_change_type.h" -#include "ash/common/focus_cycler.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/focus_cycler.h" #include "ash/root_window_controller.h" +#include "ash/session/session_state_delegate.h" #include "ash/shelf/app_list_button.h" #include "ash/shelf/shelf_background_animator_observer.h" #include "ash/shelf/shelf_constants.h" @@ -21,6 +19,8 @@ #include "ash/system/status_area_layout_manager.h" #include "ash/system/status_area_widget.h" #include "ash/wm/window_properties.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/memory/ptr_util.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h"
diff --git a/ash/shelf/shelf_widget_unittest.cc b/ash/shelf/shelf_widget_unittest.cc index 4e4f4f8..cd91b1f 100644 --- a/ash/shelf/shelf_widget_unittest.cc +++ b/ash/shelf/shelf_widget_unittest.cc
@@ -4,8 +4,6 @@ #include "ash/shelf/shelf_widget.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/root_window_controller.h" #include "ash/shelf/shelf_constants.h" #include "ash/shelf/shelf_layout_manager.h" @@ -17,6 +15,8 @@ #include "ash/test/ash_test_helper.h" #include "ash/test/shelf_view_test_api.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/display/display.h" #include "ui/events/event_utils.h"
diff --git a/ash/shelf/shelf_window_targeter.cc b/ash/shelf/shelf_window_targeter.cc index d881be7..6668ad5 100644 --- a/ash/shelf/shelf_window_targeter.cc +++ b/ash/shelf/shelf_window_targeter.cc
@@ -4,10 +4,10 @@ #include "ash/shelf/shelf_window_targeter.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shelf_types.h" #include "ash/shelf/shelf_constants.h" #include "ash/shelf/wm_shelf.h" +#include "ash/wm_window.h" #include "ui/aura/window.h" namespace ash {
diff --git a/ash/shelf/shelf_window_watcher.cc b/ash/shelf/shelf_window_watcher.cc index 2f607f8..4f04d95f 100644 --- a/ash/shelf/shelf_window_watcher.cc +++ b/ash/shelf/shelf_window_watcher.cc
@@ -7,8 +7,6 @@ #include <memory> #include <utility> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/public/cpp/window_properties.h" #include "ash/shelf/shelf_constants.h" @@ -19,6 +17,8 @@ #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/env.h" #include "ui/aura/window.h"
diff --git a/ash/shelf/shelf_window_watcher_item_delegate.cc b/ash/shelf/shelf_window_watcher_item_delegate.cc index fbd905b..9c3b08a 100644 --- a/ash/shelf/shelf_window_watcher_item_delegate.cc +++ b/ash/shelf/shelf_window_watcher_item_delegate.cc
@@ -4,13 +4,13 @@ #include "ash/shelf/shelf_window_watcher_item_delegate.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/window_properties.h" #include "ash/shelf/shelf_controller.h" #include "ash/shelf/shelf_model.h" #include "ash/wm/window_state.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/aura/window.h" #include "ui/events/event_constants.h"
diff --git a/ash/shelf/shelf_window_watcher_unittest.cc b/ash/shelf/shelf_window_watcher_unittest.cc index 3f104c19..60d8cf2 100644 --- a/ash/shelf/shelf_window_watcher_unittest.cc +++ b/ash/shelf/shelf_window_watcher_unittest.cc
@@ -4,17 +4,17 @@ #include "ash/shelf/shelf_window_watcher.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/public/cpp/window_properties.h" #include "ash/root_window_controller.h" +#include "ash/session/session_state_delegate.h" #include "ash/shelf/shelf_item_types.h" #include "ash/shelf/shelf_model.h" #include "ash/test/ash_test_base.h" #include "ash/wm/window_resizer.h" #include "ash/wm/window_state.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/base/hit_test.h" #include "ui/views/widget/widget.h"
diff --git a/ash/shelf/wm_shelf.cc b/ash/shelf/wm_shelf.cc index fdd2aeb..28232533 100644 --- a/ash/shelf/wm_shelf.cc +++ b/ash/shelf/wm_shelf.cc
@@ -4,8 +4,6 @@ #include "ash/shelf/wm_shelf.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/shelf/shelf_bezel_event_handler.h" @@ -19,6 +17,8 @@ #include "ash/shelf/wm_shelf_observer.h" #include "ash/shell.h" #include "ash/system/tray/system_tray_delegate.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "ui/aura/env.h"
diff --git a/ash/shell.cc b/ash/shell.cc index 3a71803..f46884f5 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"
diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc index cd7b010..808547a 100644 --- a/ash/shell/app_list.cc +++ b/ash/shell/app_list.cc
@@ -7,10 +7,10 @@ #include <utility> #include <vector> -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/session/session_state_delegate.h" #include "ash/shell/example_factory.h" #include "ash/shell/toplevel_window.h" +#include "ash/wm_shell.h" #include "base/callback.h" #include "base/files/file_path.h" #include "base/i18n/case_conversion.h"
diff --git a/ash/shell/content/client/shell_browser_main_parts.cc b/ash/shell/content/client/shell_browser_main_parts.cc index 84299c3..db28ff2 100644 --- a/ash/shell/content/client/shell_browser_main_parts.cc +++ b/ash/shell/content/client/shell_browser_main_parts.cc
@@ -4,15 +4,15 @@ #include "ash/shell/content/client/shell_browser_main_parts.h" -#include "ash/common/login_status.h" -#include "ash/common/wm_shell.h" #include "ash/content/shell_content_state.h" +#include "ash/login_status.h" #include "ash/shell.h" #include "ash/shell/content/shell_content_state_impl.h" #include "ash/shell/example_app_list_presenter.h" #include "ash/shell/shell_delegate_impl.h" #include "ash/shell/window_watcher.h" #include "ash/shell_init_params.h" +#include "ash/wm_shell.h" #include "base/bind.h" #include "base/command_line.h" #include "base/i18n/icu_util.h"
diff --git a/ash/shell/lock_view.cc b/ash/shell/lock_view.cc index eb333a7..c5cdddbc 100644 --- a/ash/shell/lock_view.cc +++ b/ash/shell/lock_view.cc
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/session/session_state_delegate.h" #include "ash/shell.h" #include "ash/shell/example_factory.h" +#include "ash/wm_shell.h" #include "base/strings/utf_string_conversions.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h"
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc index 0f47f6a..ef3794b 100644 --- a/ash/shell/shell_delegate_impl.cc +++ b/ash/shell/shell_delegate_impl.cc
@@ -4,13 +4,13 @@ #include "ash/shell/shell_delegate_impl.h" -#include "ash/common/accessibility_delegate.h" -#include "ash/common/default_accessibility_delegate.h" -#include "ash/common/gpu_support_stub.h" -#include "ash/common/palette_delegate.h" -#include "ash/common/session/session_state_delegate.h" +#include "ash/accessibility_delegate.h" +#include "ash/default_accessibility_delegate.h" #include "ash/default_wallpaper_delegate.h" +#include "ash/gpu_support_stub.h" +#include "ash/palette_delegate.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/session/session_state_delegate.h" #include "ash/shell.h" #include "ash/shell/context_menu.h" #include "ash/shell/example_factory.h"
diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h index dfe85b6..3f953ba 100644 --- a/ash/shell/shell_delegate_impl.h +++ b/ash/shell/shell_delegate_impl.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "ash/common/shell_delegate.h" +#include "ash/shell_delegate.h" #include "base/macros.h" namespace keyboard {
diff --git a/ash/shell/window_type_launcher.cc b/ash/shell/window_type_launcher.cc index 6a959d1..ef10f36c 100644 --- a/ash/shell/window_type_launcher.cc +++ b/ash/shell/window_type_launcher.cc
@@ -6,11 +6,10 @@ #include <utility> -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" #include "ash/content/shell_content_state.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/session/session_state_delegate.h" #include "ash/shell.h" #include "ash/shell/example_factory.h" #include "ash/shell/panel_window.h" @@ -18,6 +17,7 @@ #include "ash/system/status_area_widget.h" #include "ash/system/web_notification/web_notification_tray.h" #include "ash/test/child_modal_window.h" +#include "ash/wm_shell.h" #include "base/strings/utf_string_conversions.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h"
diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc index a789dd6..aca442c 100644 --- a/ash/shell/window_watcher.cc +++ b/ash/shell/window_watcher.cc
@@ -6,8 +6,6 @@ #include <utility> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/display/window_tree_host_manager.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shelf/shelf_model.h" @@ -16,6 +14,8 @@ #include "ash/shell/window_watcher_shelf_item_delegate.h" #include "ash/wm/window_properties.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/display/display.h"
diff --git a/ash/common/shell_delegate.h b/ash/shell_delegate.h similarity index 97% rename from ash/common/shell_delegate.h rename to ash/shell_delegate.h index f584cf7..ce83773 100644 --- a/ash/common/shell_delegate.h +++ b/ash/shell_delegate.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELL_DELEGATE_H_ -#define ASH_COMMON_SHELL_DELEGATE_H_ +#ifndef ASH_SHELL_DELEGATE_H_ +#define ASH_SHELL_DELEGATE_H_ #include <memory> #include <string> @@ -140,4 +140,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELL_DELEGATE_H_ +#endif // ASH_SHELL_DELEGATE_H_
diff --git a/ash/common/shell_observer.h b/ash/shell_observer.h similarity index 94% rename from ash/common/shell_observer.h rename to ash/shell_observer.h index facc29b..899bb53 100644 --- a/ash/common/shell_observer.h +++ b/ash/shell_observer.h
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELL_OBSERVER_H_ -#define ASH_COMMON_SHELL_OBSERVER_H_ +#ifndef ASH_SHELL_OBSERVER_H_ +#define ASH_SHELL_OBSERVER_H_ #include "ash/ash_export.h" -#include "ash/common/login_status.h" +#include "ash/login_status.h" namespace ash { @@ -79,4 +79,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELL_OBSERVER_H_ +#endif // ASH_SHELL_OBSERVER_H_
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc index 69877481..d2ea190 100644 --- a/ash/shell_unittest.cc +++ b/ash/shell_unittest.cc
@@ -7,20 +7,20 @@ #include <algorithm> #include <vector> -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wallpaper/wallpaper_widget_controller.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/display/mouse_cursor_event_filter.h" #include "ash/drag_drop/drag_drop_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/shelf_layout_manager.h" #include "ash/shelf/shelf_widget.h" #include "ash/shelf/wm_shelf.h" #include "ash/test/ash_test_base.h" #include "ash/test/shell_test_api.h" +#include "ash/wallpaper/wallpaper_widget_controller.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/thread_task_runner_handle.h" #include "ui/aura/client/aura_constants.h"
diff --git a/ash/common/shutdown_controller.cc b/ash/shutdown_controller.cc similarity index 90% rename from ash/common/shutdown_controller.cc rename to ash/shutdown_controller.cc index b40fe86..e44061b 100644 --- a/ash/common/shutdown_controller.cc +++ b/ash/shutdown_controller.cc
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shutdown_controller.h" +#include "ash/shutdown_controller.h" -#include "ash/common/shell_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/shell_delegate.h" +#include "ash/wm_shell.h" #include "base/sys_info.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/power_manager_client.h"
diff --git a/ash/common/shutdown_controller.h b/ash/shutdown_controller.h similarity index 91% rename from ash/common/shutdown_controller.h rename to ash/shutdown_controller.h index 266af11..add5573 100644 --- a/ash/common/shutdown_controller.h +++ b/ash/shutdown_controller.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHUTDOWN_CONTROLLER_H_ -#define ASH_COMMON_SHUTDOWN_CONTROLLER_H_ +#ifndef ASH_SHUTDOWN_CONTROLLER_H_ +#define ASH_SHUTDOWN_CONTROLLER_H_ #include "ash/ash_export.h" #include "ash/public/interfaces/shutdown.mojom.h" @@ -46,4 +46,4 @@ } // namespace ash -#endif // ASH_COMMON_SHUTDOWN_CONTROLLER_H_ +#endif // ASH_SHUTDOWN_CONTROLLER_H_
diff --git a/ash/sticky_keys/sticky_keys_overlay_unittest.cc b/ash/sticky_keys/sticky_keys_overlay_unittest.cc index ddede54..c4302fc 100644 --- a/ash/sticky_keys/sticky_keys_overlay_unittest.cc +++ b/ash/sticky_keys/sticky_keys_overlay_unittest.cc
@@ -4,11 +4,11 @@ #include "ash/sticky_keys/sticky_keys_overlay.h" -#include "ash/common/wm_shell.h" #include "ash/display/window_tree_host_manager.h" #include "ash/shell.h" #include "ash/sticky_keys/sticky_keys_controller.h" #include "ash/test/ash_test_base.h" +#include "ash/wm_shell.h" #include "ui/display/display_layout.h" #include "ui/display/manager/display_manager.h" #include "ui/display/test/display_manager_test_api.h"
diff --git a/ash/system/accessibility_observer.h b/ash/system/accessibility_observer.h index fb6b9371..524bb76 100644 --- a/ash/system/accessibility_observer.h +++ b/ash/system/accessibility_observer.h
@@ -5,8 +5,8 @@ #ifndef ASH_SYSTEM_ACCESSIBILITY_OBSERVER_H_ #define ASH_SYSTEM_ACCESSIBILITY_OBSERVER_H_ +#include "ash/accessibility_types.h" #include "ash/ash_export.h" -#include "ash/common/accessibility_types.h" namespace ash {
diff --git a/ash/system/audio/tray_audio.cc b/ash/system/audio/tray_audio.cc index ac4a3fb..63701a2 100644 --- a/ash/system/audio/tray_audio.cc +++ b/ash/system/audio/tray_audio.cc
@@ -4,14 +4,14 @@ #include "ash/system/audio/tray_audio.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/root_window_controller.h" #include "ash/system/audio/audio_detailed_view.h" #include "ash/system/audio/tray_audio_delegate_chromeos.h" #include "ash/system/audio/volume_view.h" #include "ash/system/tray/system_tray.h" #include "ash/system/tray/tray_constants.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "ui/display/display.h" #include "ui/display/manager/managed_display_info.h"
diff --git a/ash/system/audio/volume_view.cc b/ash/system/audio/volume_view.cc index dd755925..e287398 100644 --- a/ash/system/audio/volume_view.cc +++ b/ash/system/audio/volume_view.cc
@@ -6,7 +6,6 @@ #include <algorithm> -#include "ash/common/wm_shell.h" #include "ash/metrics/user_metrics_action.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/strings/grit/ash_strings.h" @@ -17,6 +16,7 @@ #include "ash/system/tray/tray_popup_item_container.h" #include "ash/system/tray/tray_popup_utils.h" #include "ash/system/tray/tri_view.h" +#include "ash/wm_shell.h" #include "ui/accessibility/ax_node_data.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/paint_vector_icon.h"
diff --git a/ash/system/bluetooth/tray_bluetooth.cc b/ash/system/bluetooth/tray_bluetooth.cc index 8d8889b..e50b0c3d 100644 --- a/ash/system/bluetooth/tray_bluetooth.cc +++ b/ash/system/bluetooth/tray_bluetooth.cc
@@ -4,10 +4,9 @@ #include "ash/system/bluetooth/tray_bluetooth.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" #include "ash/resources/grit/ash_resources.h" #include "ash/resources/vector_icons/vector_icons.h" +#include "ash/session/session_state_delegate.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/tray/hover_highlight_view.h" #include "ash/system/tray/system_tray.h" @@ -20,6 +19,7 @@ #include "ash/system/tray/tray_popup_item_style.h" #include "ash/system/tray/tray_popup_utils.h" #include "ash/system/tray/tri_view.h" +#include "ash/wm_shell.h" #include "device/bluetooth/bluetooth_common.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h"
diff --git a/ash/system/brightness/tray_brightness.cc b/ash/system/brightness/tray_brightness.cc index 79ae2c4e..795a4ec 100644 --- a/ash/system/brightness/tray_brightness.cc +++ b/ash/system/brightness/tray_brightness.cc
@@ -6,17 +6,17 @@ #include <algorithm> -#include "ash/common/material_design/material_design_controller.h" -#include "ash/common/shell_observer.h" -#include "ash/common/wm_shell.h" +#include "ash/material_design/material_design_controller.h" #include "ash/resources/grit/ash_resources.h" #include "ash/resources/vector_icons/vector_icons.h" +#include "ash/shell_observer.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/brightness_control_delegate.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_popup_utils.h" #include "ash/system/tray/tri_view.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm_shell.h" #include "base/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/ash/system/brightness/tray_brightness_unittest.cc b/ash/system/brightness/tray_brightness_unittest.cc index 31e470f..ad452ce 100644 --- a/ash/system/brightness/tray_brightness_unittest.cc +++ b/ash/system/brightness/tray_brightness_unittest.cc
@@ -6,12 +6,12 @@ #include <memory> -#include "ash/common/material_design/material_design_controller.h" -#include "ash/common/wm_shell.h" +#include "ash/material_design/material_design_controller.h" #include "ash/system/tray/system_tray_delegate.h" #include "ash/system/tray/system_tray_item.h" #include "ash/test/ash_test.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm_shell.h" #include "ui/views/view.h" namespace ash {
diff --git a/ash/system/cast/tray_cast.cc b/ash/system/cast/tray_cast.cc index 9765818..a016dcb 100644 --- a/ash/system/cast/tray_cast.cc +++ b/ash/system/cast/tray_cast.cc
@@ -9,14 +9,13 @@ #include <utility> #include <vector> -#include "ash/common/cast_config_controller.h" -#include "ash/common/material_design/material_design_controller.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/cast_config_controller.h" +#include "ash/material_design/material_design_controller.h" #include "ash/public/cpp/shelf_types.h" #include "ash/public/interfaces/cast_config.mojom.h" #include "ash/resources/grit/ash_resources.h" #include "ash/resources/vector_icons/vector_icons.h" +#include "ash/session/session_state_delegate.h" #include "ash/shelf/wm_shelf_util.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/screen_security/screen_tray_item.h" @@ -30,6 +29,7 @@ #include "ash/system/tray/tray_item_more.h" #include "ash/system/tray/tray_item_view.h" #include "ash/system/tray/tray_utils.h" +#include "ash/wm_shell.h" #include "base/bind.h" #include "base/strings/utf_string_conversions.h" #include "ui/base/l10n/l10n_util.h"
diff --git a/ash/system/cast/tray_cast.h b/ash/system/cast/tray_cast.h index 3935250d..3e6b920 100644 --- a/ash/system/cast/tray_cast.h +++ b/ash/system/cast/tray_cast.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "ash/common/cast_config_controller.h" -#include "ash/common/shell_observer.h" +#include "ash/cast_config_controller.h" +#include "ash/shell_observer.h" #include "ash/system/tray/system_tray_item.h" #include "base/macros.h"
diff --git a/ash/system/date/date_default_view.cc b/ash/system/date/date_default_view.cc index 023ebba..dd864d6 100644 --- a/ash/system/date/date_default_view.cc +++ b/ash/system/date/date_default_view.cc
@@ -4,12 +4,11 @@ #include "ash/system/date/date_default_view.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/shutdown_controller.h" -#include "ash/common/wm_shell.h" #include "ash/metrics/user_metrics_action.h" #include "ash/resources/grit/ash_resources.h" +#include "ash/session/session_state_delegate.h" #include "ash/shell.h" +#include "ash/shutdown_controller.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/date/date_view.h" #include "ash/system/tray/special_popup_row.h" @@ -18,6 +17,7 @@ #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_popup_header_button.h" #include "ash/wm/lock_state_controller.h" +#include "ash/wm_shell.h" #include "base/i18n/rtl.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/session_manager_client.h"
diff --git a/ash/system/date/date_default_view.h b/ash/system/date/date_default_view.h index 5a3217cf..4dd15f5 100644 --- a/ash/system/date/date_default_view.h +++ b/ash/system/date/date_default_view.h
@@ -6,7 +6,7 @@ #define ASH_SYSTEM_DATE_DATE_DEFAULT_VIEW_H_ #include "ash/ash_export.h" -#include "ash/common/login_status.h" +#include "ash/login_status.h" #include "base/macros.h" #include "ui/views/controls/button/button.h" #include "ui/views/view.h"
diff --git a/ash/system/date/date_view.cc b/ash/system/date/date_view.cc index 12440cd..04c7105 100644 --- a/ash/system/date/date_view.cc +++ b/ash/system/date/date_view.cc
@@ -4,14 +4,14 @@ #include "ash/system/date/date_view.h" -#include "ash/common/material_design/material_design_controller.h" -#include "ash/common/wm_shell.h" +#include "ash/material_design/material_design_controller.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/tray/system_tray_controller.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_popup_item_style.h" #include "ash/system/tray/tray_popup_utils.h" #include "ash/system/tray/tray_utils.h" +#include "ash/wm_shell.h" #include "base/i18n/rtl.h" #include "base/i18n/time_formatting.h" #include "base/strings/utf_string_conversions.h"
diff --git a/ash/system/date/system_info_default_view.h b/ash/system/date/system_info_default_view.h index 287f7c1..4143cac 100644 --- a/ash/system/date/system_info_default_view.h +++ b/ash/system/date/system_info_default_view.h
@@ -6,7 +6,7 @@ #define ASH_SYSTEM_DATE_SYSTEM_INFO_DEFAULT_VIEW_H_ #include "ash/ash_export.h" -#include "ash/common/login_status.h" +#include "ash/login_status.h" #include "base/macros.h" #include "ui/views/view.h"
diff --git a/ash/system/date/tray_date.cc b/ash/system/date/tray_date.cc index 28847c1..f75a8c5d 100644 --- a/ash/system/date/tray_date.cc +++ b/ash/system/date/tray_date.cc
@@ -4,7 +4,6 @@ #include "ash/system/date/tray_date.h" -#include "ash/common/wm_shell.h" #include "ash/shelf/wm_shelf_util.h" #include "ash/system/date/date_default_view.h" #include "ash/system/date/date_view.h" @@ -12,6 +11,7 @@ #include "ash/system/tray/system_tray.h" #include "ash/system/tray/system_tray_notifier.h" #include "ash/system/tray/tray_item_view.h" +#include "ash/wm_shell.h" namespace ash {
diff --git a/ash/system/date/tray_date.h b/ash/system/date/tray_date.h index 2ef30fb..6abe915 100644 --- a/ash/system/date/tray_date.h +++ b/ash/system/date/tray_date.h
@@ -8,7 +8,7 @@ #include <memory> #include "ash/ash_export.h" -#include "ash/common/login_status.h" +#include "ash/login_status.h" #include "ash/system/date/clock_observer.h" #include "ash/system/tray/system_tray_item.h" #include "base/macros.h"
diff --git a/ash/system/date/tray_system_info.cc b/ash/system/date/tray_system_info.cc index 4b04912..2b85c9d 100644 --- a/ash/system/date/tray_system_info.cc +++ b/ash/system/date/tray_system_info.cc
@@ -4,7 +4,6 @@ #include "ash/system/date/tray_system_info.h" -#include "ash/common/wm_shell.h" #include "ash/shelf/wm_shelf_util.h" #include "ash/system/date/date_view.h" #include "ash/system/date/system_info_default_view.h" @@ -12,6 +11,7 @@ #include "ash/system/tray/system_tray.h" #include "ash/system/tray/system_tray_notifier.h" #include "ash/system/tray/tray_item_view.h" +#include "ash/wm_shell.h" namespace ash {
diff --git a/ash/system/date/tray_system_info.h b/ash/system/date/tray_system_info.h index 6132b7f..04a57fdc 100644 --- a/ash/system/date/tray_system_info.h +++ b/ash/system/date/tray_system_info.h
@@ -8,7 +8,7 @@ #include <memory> #include "ash/ash_export.h" -#include "ash/common/login_status.h" +#include "ash/login_status.h" #include "ash/system/date/clock_observer.h" #include "ash/system/tray/system_tray_item.h" #include "base/macros.h"
diff --git a/ash/system/enterprise/tray_enterprise.cc b/ash/system/enterprise/tray_enterprise.cc index 747223c..4bc73b2e 100644 --- a/ash/system/enterprise/tray_enterprise.cc +++ b/ash/system/enterprise/tray_enterprise.cc
@@ -4,12 +4,12 @@ #include "ash/system/enterprise/tray_enterprise.h" -#include "ash/common/login_status.h" -#include "ash/common/wm_shell.h" +#include "ash/login_status.h" #include "ash/resources/grit/ash_resources.h" #include "ash/system/tray/label_tray_view.h" #include "ash/system/tray/system_tray_delegate.h" #include "ash/system/tray/system_tray_notifier.h" +#include "ash/wm_shell.h" #include "base/logging.h" #include "base/strings/string16.h"
diff --git a/ash/system/ime/tray_ime_chromeos.cc b/ash/system/ime/tray_ime_chromeos.cc index 2660ffc..f3eea1f6 100644 --- a/ash/system/ime/tray_ime_chromeos.cc +++ b/ash/system/ime/tray_ime_chromeos.cc
@@ -6,11 +6,10 @@ #include <vector> -#include "ash/common/material_design/material_design_controller.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/material_design/material_design_controller.h" #include "ash/resources/grit/ash_resources.h" #include "ash/resources/vector_icons/vector_icons.h" +#include "ash/session/session_state_delegate.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/tray/hover_highlight_view.h" #include "ash/system/tray/system_tray.h" @@ -26,6 +25,7 @@ #include "ash/system/tray/tray_utils.h" #include "ash/system/tray/tri_view.h" #include "ash/system/tray_accessibility.h" +#include "ash/wm_shell.h" #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "ui/accessibility/ax_enums.h"
diff --git a/ash/system/ime/tray_ime_chromeos_unittest.cc b/ash/system/ime/tray_ime_chromeos_unittest.cc index 4739228..9af63a2 100644 --- a/ash/system/ime/tray_ime_chromeos_unittest.cc +++ b/ash/system/ime/tray_ime_chromeos_unittest.cc
@@ -4,12 +4,12 @@ #include "ash/system/ime/tray_ime_chromeos.h" -#include "ash/common/accessibility_delegate.h" -#include "ash/common/accessibility_types.h" -#include "ash/common/wm_shell.h" +#include "ash/accessibility_delegate.h" +#include "ash/accessibility_types.h" #include "ash/system/ime_menu/ime_list_view.h" #include "ash/system/tray/system_tray_notifier.h" #include "ash/test/ash_test_base.h" +#include "ash/wm_shell.h" #include "base/strings/utf_string_conversions.h" #include "ui/events/devices/device_data_manager.h" #include "ui/keyboard/keyboard_util.h"
diff --git a/ash/system/ime_menu/ime_list_view.cc b/ash/system/ime_menu/ime_list_view.cc index 0b2947b8..0dab12f 100644 --- a/ash/system/ime_menu/ime_list_view.cc +++ b/ash/system/ime_menu/ime_list_view.cc
@@ -4,8 +4,7 @@ #include "ash/system/ime_menu/ime_list_view.h" -#include "ash/common/material_design/material_design_controller.h" -#include "ash/common/wm_shell.h" +#include "ash/material_design/material_design_controller.h" #include "ash/resources/grit/ash_resources.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/tray/hover_highlight_view.h" @@ -18,6 +17,7 @@ #include "ash/system/tray/tray_popup_item_style.h" #include "ash/system/tray/tray_popup_utils.h" #include "ash/system/tray/tri_view.h" +#include "ash/wm_shell.h" #include "ui/accessibility/ax_node_data.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h"
diff --git a/ash/system/ime_menu/ime_menu_tray.cc b/ash/system/ime_menu/ime_menu_tray.cc index 700207fd..80e6c5e2 100644 --- a/ash/system/ime_menu/ime_menu_tray.cc +++ b/ash/system/ime_menu/ime_menu_tray.cc
@@ -4,15 +4,13 @@ #include "ash/system/ime_menu/ime_menu_tray.h" -#include "ash/common/accessibility_delegate.h" -#include "ash/common/ash_constants.h" -#include "ash/common/material_design/material_design_controller.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/accessibility_delegate.h" +#include "ash/ash_constants.h" +#include "ash/material_design/material_design_controller.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/resources/grit/ash_resources.h" #include "ash/root_window_controller.h" +#include "ash/session/session_state_delegate.h" #include "ash/shelf/wm_shelf.h" #include "ash/shelf/wm_shelf_util.h" #include "ash/strings/grit/ash_strings.h" @@ -26,6 +24,8 @@ #include "ash/system/tray/tray_popup_item_style.h" #include "ash/system/tray/tray_popup_utils.h" #include "ash/system/tray/tray_utils.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h" #include "ui/base/ime/chromeos/input_method_manager.h"
diff --git a/ash/system/ime_menu/ime_menu_tray_unittest.cc b/ash/system/ime_menu/ime_menu_tray_unittest.cc index d001a85..95aef37 100644 --- a/ash/system/ime_menu/ime_menu_tray_unittest.cc +++ b/ash/system/ime_menu/ime_menu_tray_unittest.cc
@@ -5,8 +5,7 @@ #include "ash/system/ime_menu/ime_menu_tray.h" #include "ash/accelerators/accelerator_controller.h" -#include "ash/common/accessibility_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/accessibility_delegate.h" #include "ash/system/ime_menu/ime_list_view.h" #include "ash/system/status_area_widget.h" #include "ash/system/tray/ime_info.h" @@ -14,6 +13,7 @@ #include "ash/test/ash_test_base.h" #include "ash/test/status_area_widget_test_helper.h" #include "ash/test/test_system_tray_delegate.h" +#include "ash/wm_shell.h" #include "base/strings/utf_string_conversions.h" #include "ui/accessibility/ax_node_data.h" #include "ui/base/ime/chromeos/input_method_manager.h"
diff --git a/ash/system/keyboard_brightness_controller.cc b/ash/system/keyboard_brightness_controller.cc index 6cb803f6..94a7a8d 100644 --- a/ash/system/keyboard_brightness_controller.cc +++ b/ash/system/keyboard_brightness_controller.cc
@@ -4,7 +4,7 @@ #include "ash/system/keyboard_brightness_controller.h" -#include "ash/common/wm_shell.h" +#include "ash/wm_shell.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/power_manager_client.h" #include "ui/base/accelerators/accelerator.h"
diff --git a/ash/system/locale/locale_notification_controller.cc b/ash/system/locale/locale_notification_controller.cc index bf45085..99abfda 100644 --- a/ash/system/locale/locale_notification_controller.cc +++ b/ash/system/locale/locale_notification_controller.cc
@@ -7,11 +7,11 @@ #include <memory> #include <utility> -#include "ash/common/wm_shell.h" #include "ash/resources/grit/ash_resources.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/system_notifier.h" #include "ash/system/tray/system_tray_notifier.h" +#include "ash/wm_shell.h" #include "base/strings/string16.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h"
diff --git a/ash/system/media_security/multi_profile_media_tray_item.cc b/ash/system/media_security/multi_profile_media_tray_item.cc index be37005..8a7ad961 100644 --- a/ash/system/media_security/multi_profile_media_tray_item.cc +++ b/ash/system/media_security/multi_profile_media_tray_item.cc
@@ -4,15 +4,15 @@ #include "ash/system/media_security/multi_profile_media_tray_item.h" -#include "ash/common/ash_view_ids.h" -#include "ash/common/media_controller.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/ash_view_ids.h" +#include "ash/media_controller.h" #include "ash/resources/grit/ash_resources.h" #include "ash/resources/vector_icons/vector_icons.h" +#include "ash/session/session_state_delegate.h" #include "ash/system/tray/system_tray_notifier.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_item_view.h" +#include "ash/wm_shell.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/paint_vector_icon.h" #include "ui/views/controls/image_view.h"
diff --git a/ash/system/media_security/multi_profile_media_tray_item_unittest.cc b/ash/system/media_security/multi_profile_media_tray_item_unittest.cc index e6417cb..71d30010 100644 --- a/ash/system/media_security/multi_profile_media_tray_item_unittest.cc +++ b/ash/system/media_security/multi_profile_media_tray_item_unittest.cc
@@ -4,9 +4,8 @@ #include "ash/system/media_security/multi_profile_media_tray_item.h" -#include "ash/common/ash_view_ids.h" -#include "ash/common/media_controller.h" -#include "ash/common/wm_shell.h" +#include "ash/ash_view_ids.h" +#include "ash/media_controller.h" #include "ash/public/interfaces/media.mojom.h" #include "ash/system/status_area_widget.h" #include "ash/system/tray/system_tray.h" @@ -17,6 +16,7 @@ #include "ash/test/status_area_widget_test_helper.h" #include "ash/test/test_session_state_delegate.h" #include "ash/test/test_shell_delegate.h" +#include "ash/wm_shell.h" #include "ui/views/bubble/tray_bubble_view.h" namespace ash {
diff --git a/ash/system/network/network_state_list_detailed_view.cc b/ash/system/network/network_state_list_detailed_view.cc index caf797c..1869b14 100644 --- a/ash/system/network/network_state_list_detailed_view.cc +++ b/ash/system/network/network_state_list_detailed_view.cc
@@ -7,10 +7,8 @@ #include <algorithm> #include <vector> -#include "ash/common/ash_constants.h" -#include "ash/common/material_design/material_design_controller.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/ash_constants.h" +#include "ash/material_design/material_design_controller.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/resources/grit/ash_resources.h" #include "ash/root_window_controller.h" @@ -35,6 +33,8 @@ #include "ash/system/tray/tray_details_view.h" #include "ash/system/tray/tray_popup_header_button.h" #include "ash/system/tray/tri_view.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/ash/system/network/network_state_list_detailed_view.h b/ash/system/network/network_state_list_detailed_view.h index 7533f7f..4dd1742 100644 --- a/ash/system/network/network_state_list_detailed_view.h +++ b/ash/system/network/network_state_list_detailed_view.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "ash/common/login_status.h" +#include "ash/login_status.h" #include "ash/system/network/network_detailed_view.h" #include "ash/system/network/network_list_delegate.h" #include "base/macros.h"
diff --git a/ash/system/network/tray_network.cc b/ash/system/network/tray_network.cc index e04d0590..326338ce 100644 --- a/ash/system/network/tray_network.cc +++ b/ash/system/network/tray_network.cc
@@ -4,7 +4,6 @@ #include "ash/system/network/tray_network.h" -#include "ash/common/wm_shell.h" #include "ash/resources/grit/ash_resources.h" #include "ash/shelf/wm_shelf_util.h" #include "ash/strings/grit/ash_strings.h" @@ -21,6 +20,7 @@ #include "ash/system/tray/tray_item_view.h" #include "ash/system/tray/tray_popup_item_style.h" #include "ash/system/tray/tray_utils.h" +#include "ash/wm_shell.h" #include "base/command_line.h" #include "base/strings/utf_string_conversions.h" #include "chromeos/network/network_state.h"
diff --git a/ash/system/network/tray_vpn.cc b/ash/system/network/tray_vpn.cc index bff5b0b..27527f7 100644 --- a/ash/system/network/tray_vpn.cc +++ b/ash/system/network/tray_vpn.cc
@@ -4,9 +4,8 @@ #include "ash/system/network/tray_vpn.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" #include "ash/resources/vector_icons/vector_icons.h" +#include "ash/session/session_state_delegate.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/network/network_icon.h" #include "ash/system/network/network_icon_animation.h" @@ -18,6 +17,7 @@ #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_item_more.h" #include "ash/system/tray/tray_popup_item_style.h" +#include "ash/wm_shell.h" #include "chromeos/network/network_state.h" #include "chromeos/network/network_state_handler.h" #include "third_party/cros_system_api/dbus/service_constants.h"
diff --git a/ash/system/network/vpn_list_view.cc b/ash/system/network/vpn_list_view.cc index 7e52300..f0a5f6f7 100644 --- a/ash/system/network/vpn_list_view.cc +++ b/ash/system/network/vpn_list_view.cc
@@ -8,9 +8,8 @@ #include <utility> #include <vector> -#include "ash/common/ash_view_ids.h" -#include "ash/common/material_design/material_design_controller.h" -#include "ash/common/wm_shell.h" +#include "ash/ash_view_ids.h" +#include "ash/material_design/material_design_controller.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/network/network_icon.h" @@ -25,6 +24,7 @@ #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_popup_utils.h" #include "ash/system/tray/tri_view.h" +#include "ash/wm_shell.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/logging.h"
diff --git a/ash/system/overview/overview_button_tray.cc b/ash/system/overview/overview_button_tray.cc index 91ef413..d3502e0e 100644 --- a/ash/system/overview/overview_button_tray.cc +++ b/ash/system/overview/overview_button_tray.cc
@@ -4,15 +4,15 @@ #include "ash/system/overview/overview_button_tray.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" #include "ash/resources/vector_icons/vector_icons.h" +#include "ash/session/session_state_delegate.h" #include "ash/shelf/shelf_constants.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/tray/system_tray_delegate.h" #include "ash/system/tray/tray_constants.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "ash/wm/overview/window_selector_controller.h" +#include "ash/wm_shell.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/paint_vector_icon.h" #include "ui/views/border.h"
diff --git a/ash/system/overview/overview_button_tray.h b/ash/system/overview/overview_button_tray.h index f5db6be..7a009c81 100644 --- a/ash/system/overview/overview_button_tray.h +++ b/ash/system/overview/overview_button_tray.h
@@ -6,8 +6,8 @@ #define ASH_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_ #include "ash/ash_export.h" -#include "ash/common/session/session_state_observer.h" -#include "ash/common/shell_observer.h" +#include "ash/session/session_state_observer.h" +#include "ash/shell_observer.h" #include "ash/system/tray/tray_background_view.h" #include "base/macros.h"
diff --git a/ash/system/overview/overview_button_tray_unittest.cc b/ash/system/overview/overview_button_tray_unittest.cc index 4783129..caa69a68 100644 --- a/ash/system/overview/overview_button_tray_unittest.cc +++ b/ash/system/overview/overview_button_tray_unittest.cc
@@ -4,8 +4,7 @@ #include "ash/system/overview/overview_button_tray.h" -#include "ash/common/login_status.h" -#include "ash/common/wm_shell.h" +#include "ash/login_status.h" #include "ash/public/cpp/shelf_types.h" #include "ash/root_window_controller.h" #include "ash/rotator/screen_rotation_animator.h" @@ -16,6 +15,7 @@ #include "ash/test/test_session_state_delegate.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "ash/wm/overview/window_selector_controller.h" +#include "ash/wm_shell.h" #include "base/command_line.h" #include "base/test/user_action_tester.h" #include "base/time/time.h"
diff --git a/ash/system/palette/palette_tray.cc b/ash/system/palette/palette_tray.cc index 2d176f6..6324bc3 100644 --- a/ash/system/palette/palette_tray.cc +++ b/ash/system/palette/palette_tray.cc
@@ -4,14 +4,12 @@ #include "ash/system/palette/palette_tray.h" -#include "ash/common/material_design/material_design_controller.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/material_design/material_design_controller.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/resources/grit/ash_resources.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_constants.h" #include "ash/shelf/wm_shelf.h" #include "ash/shelf/wm_shelf_util.h" @@ -25,6 +23,8 @@ #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_popup_header_button.h" #include "ash/system/tray/tray_popup_item_style.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/metrics/histogram_macros.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h"
diff --git a/ash/system/palette/palette_tray.h b/ash/system/palette/palette_tray.h index f3b22fb..23a295a8 100644 --- a/ash/system/palette/palette_tray.h +++ b/ash/system/palette/palette_tray.h
@@ -9,9 +9,9 @@ #include <memory> #include "ash/ash_export.h" -#include "ash/common/palette_delegate.h" -#include "ash/common/session/session_state_observer.h" -#include "ash/common/shell_observer.h" +#include "ash/palette_delegate.h" +#include "ash/session/session_state_observer.h" +#include "ash/shell_observer.h" #include "ash/system/palette/palette_tool_manager.h" #include "ash/system/tray/tray_background_view.h" #include "base/macros.h"
diff --git a/ash/system/palette/palette_utils.cc b/ash/system/palette/palette_utils.cc index 20320fa1..86b9248 100644 --- a/ash/system/palette/palette_utils.cc +++ b/ash/system/palette/palette_utils.cc
@@ -4,12 +4,12 @@ #include "ash/system/palette/palette_utils.h" -#include "ash/common/ash_switches.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/ash_switches.h" #include "ash/shelf/wm_shelf.h" #include "ash/system/palette/palette_tray.h" #include "ash/system/status_area_widget.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "ui/events/devices/input_device_manager.h" #include "ui/events/devices/touchscreen_device.h"
diff --git a/ash/system/palette/tools/capture_region_mode.cc b/ash/system/palette/tools/capture_region_mode.cc index d0b6ac3..0cfae4f 100644 --- a/ash/system/palette/tools/capture_region_mode.cc +++ b/ash/system/palette/tools/capture_region_mode.cc
@@ -5,13 +5,13 @@ #include "ash/system/palette/tools/capture_region_mode.h" #include "ash/accelerators/accelerator_controller.h" -#include "ash/common/palette_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/palette_delegate.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/palette/palette_ids.h" #include "ash/system/toast/toast_data.h" #include "ash/system/toast/toast_manager.h" +#include "ash/wm_shell.h" #include "ui/base/l10n/l10n_util.h" namespace ash {
diff --git a/ash/system/palette/tools/capture_screen_action.cc b/ash/system/palette/tools/capture_screen_action.cc index 45deba4b..1aaa276 100644 --- a/ash/system/palette/tools/capture_screen_action.cc +++ b/ash/system/palette/tools/capture_screen_action.cc
@@ -4,11 +4,11 @@ #include "ash/system/palette/tools/capture_screen_action.h" -#include "ash/common/palette_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/palette_delegate.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/palette/palette_ids.h" +#include "ash/wm_shell.h" #include "ui/base/l10n/l10n_util.h" namespace ash {
diff --git a/ash/system/palette/tools/create_note_action.cc b/ash/system/palette/tools/create_note_action.cc index 66dcfd4..f60fd0aa8 100644 --- a/ash/system/palette/tools/create_note_action.cc +++ b/ash/system/palette/tools/create_note_action.cc
@@ -4,11 +4,11 @@ #include "ash/system/palette/tools/create_note_action.h" -#include "ash/common/palette_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/palette_delegate.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/palette/palette_ids.h" +#include "ash/wm_shell.h" #include "ui/base/l10n/l10n_util.h" namespace ash {
diff --git a/ash/system/palette/tools/create_note_unittest.cc b/ash/system/palette/tools/create_note_unittest.cc index a3f04dd..10074fae 100644 --- a/ash/system/palette/tools/create_note_unittest.cc +++ b/ash/system/palette/tools/create_note_unittest.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm_shell.h" #include "ash/system/palette/mock_palette_tool_delegate.h" #include "ash/system/palette/palette_ids.h" #include "ash/system/palette/palette_tool.h" #include "ash/system/palette/tools/create_note_action.h" #include "ash/test/ash_test_base.h" #include "ash/test/test_palette_delegate.h" +#include "ash/wm_shell.h" #include "base/macros.h" #include "base/memory/ptr_util.h" #include "ui/views/view.h"
diff --git a/ash/system/palette/tools/laser_pointer_mode.cc b/ash/system/palette/tools/laser_pointer_mode.cc index bc69941..d5c21d5f 100644 --- a/ash/system/palette/tools/laser_pointer_mode.cc +++ b/ash/system/palette/tools/laser_pointer_mode.cc
@@ -4,11 +4,11 @@ #include "ash/system/palette/tools/laser_pointer_mode.h" -#include "ash/common/palette_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/palette_delegate.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/palette/palette_ids.h" +#include "ash/wm_shell.h" #include "ui/base/l10n/l10n_util.h" namespace ash {
diff --git a/ash/system/palette/tools/magnifier_mode.cc b/ash/system/palette/tools/magnifier_mode.cc index 9822b01..411f81d 100644 --- a/ash/system/palette/tools/magnifier_mode.cc +++ b/ash/system/palette/tools/magnifier_mode.cc
@@ -4,11 +4,11 @@ #include "ash/system/palette/tools/magnifier_mode.h" -#include "ash/common/palette_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/palette_delegate.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/palette/palette_ids.h" +#include "ash/wm_shell.h" #include "ui/base/l10n/l10n_util.h" namespace ash {
diff --git a/ash/system/palette/tools/screenshot_unittest.cc b/ash/system/palette/tools/screenshot_unittest.cc index 1b30fe2..8207ce72 100644 --- a/ash/system/palette/tools/screenshot_unittest.cc +++ b/ash/system/palette/tools/screenshot_unittest.cc
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm_shell.h" #include "ash/system/palette/mock_palette_tool_delegate.h" #include "ash/system/palette/palette_ids.h" #include "ash/system/palette/palette_tool.h" @@ -10,6 +9,7 @@ #include "ash/system/palette/tools/capture_screen_action.h" #include "ash/test/ash_test_base.h" #include "ash/test/test_palette_delegate.h" +#include "ash/wm_shell.h" #include "base/macros.h" #include "base/memory/ptr_util.h"
diff --git a/ash/system/power/dual_role_notification.cc b/ash/system/power/dual_role_notification.cc index 5cc1aec5..b438e3b 100644 --- a/ash/system/power/dual_role_notification.cc +++ b/ash/system/power/dual_role_notification.cc
@@ -6,12 +6,12 @@ #include <set> -#include "ash/common/wm_shell.h" #include "ash/resources/grit/ash_resources.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/power/power_status.h" #include "ash/system/system_notifier.h" #include "ash/system/tray/system_tray_controller.h" +#include "ash/wm_shell.h" #include "base/strings/utf_string_conversions.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/time_format.h"
diff --git a/ash/system/power/power_event_observer.cc b/ash/system/power/power_event_observer.cc index ac24aed..68d8cb0 100644 --- a/ash/system/power/power_event_observer.cc +++ b/ash/system/power/power_event_observer.cc
@@ -4,11 +4,11 @@ #include "ash/system/power/power_event_observer.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/session/session_state_delegate.h" #include "ash/shell.h" #include "ash/system/tray/system_tray_notifier.h" #include "ash/wm/power_button_controller.h" +#include "ash/wm_shell.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h"
diff --git a/ash/system/power/power_status.cc b/ash/system/power/power_status.cc index 92deb8e..496cbe4d 100644 --- a/ash/system/power/power_status.cc +++ b/ash/system/power/power_status.cc
@@ -7,7 +7,7 @@ #include <algorithm> #include <cmath> -#include "ash/common/material_design/material_design_controller.h" +#include "ash/material_design/material_design_controller.h" #include "ash/resources/grit/ash_resources.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/strings/grit/ash_strings.h"
diff --git a/ash/system/power/power_status_view.cc b/ash/system/power/power_status_view.cc index bcb33af..8a809487 100644 --- a/ash/system/power/power_status_view.cc +++ b/ash/system/power/power_status_view.cc
@@ -4,7 +4,7 @@ #include "ash/system/power/power_status_view.h" -#include "ash/common/material_design/material_design_controller.h" +#include "ash/material_design/material_design_controller.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/power/power_status.h" #include "ash/system/power/tray_power.h"
diff --git a/ash/system/power/tablet_power_button_controller.cc b/ash/system/power/tablet_power_button_controller.cc index 3a06df60..9451205 100644 --- a/ash/system/power/tablet_power_button_controller.cc +++ b/ash/system/power/tablet_power_button_controller.cc
@@ -4,13 +4,13 @@ #include "ash/system/power/tablet_power_button_controller.h" -#include "ash/common/accessibility_delegate.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/shell_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/accessibility_delegate.h" +#include "ash/session/session_state_delegate.h" #include "ash/shell.h" +#include "ash/shell_delegate.h" #include "ash/wm/lock_state_controller.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm_shell.h" #include "base/time/default_tick_clock.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "ui/events/devices/input_device_manager.h"
diff --git a/ash/system/power/tablet_power_button_controller.h b/ash/system/power/tablet_power_button_controller.h index 834045e1..e3d74745 100644 --- a/ash/system/power/tablet_power_button_controller.h +++ b/ash/system/power/tablet_power_button_controller.h
@@ -8,7 +8,7 @@ #include <memory> #include "ash/ash_export.h" -#include "ash/common/shell_observer.h" +#include "ash/shell_observer.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/time/tick_clock.h"
diff --git a/ash/system/power/tablet_power_button_controller_unittest.cc b/ash/system/power/tablet_power_button_controller_unittest.cc index e9a1373..ef307e3 100644 --- a/ash/system/power/tablet_power_button_controller_unittest.cc +++ b/ash/system/power/tablet_power_button_controller_unittest.cc
@@ -6,9 +6,8 @@ #include <memory> -#include "ash/common/ash_switches.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/ash_switches.h" +#include "ash/session/session_state_delegate.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/lock_state_controller_test_api.h" @@ -16,6 +15,7 @@ #include "ash/wm/lock_state_controller.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "ash/wm/power_button_controller.h" +#include "ash/wm_shell.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/memory/ptr_util.h"
diff --git a/ash/system/power/tray_power.cc b/ash/system/power/tray_power.cc index 3cf6f61..ffc83302 100644 --- a/ash/system/power/tray_power.cc +++ b/ash/system/power/tray_power.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "ash/common/accessibility_delegate.h" -#include "ash/common/ash_switches.h" +#include "ash/accessibility_delegate.h" +#include "ash/ash_switches.h" #include "ash/resources/grit/ash_resources.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/date/date_view.h"
diff --git a/ash/system/power/video_activity_notifier.cc b/ash/system/power/video_activity_notifier.cc index c230eb59..f7ce700 100644 --- a/ash/system/power/video_activity_notifier.cc +++ b/ash/system/power/video_activity_notifier.cc
@@ -4,9 +4,9 @@ #include "ash/system/power/video_activity_notifier.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/session/session_state_delegate.h" #include "ash/shell.h" +#include "ash/wm_shell.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/power_manager_client.h"
diff --git a/ash/system/rotation/tray_rotation_lock.cc b/ash/system/rotation/tray_rotation_lock.cc index 502b5b4..7beae6d 100644 --- a/ash/system/rotation/tray_rotation_lock.cc +++ b/ash/system/rotation/tray_rotation_lock.cc
@@ -4,7 +4,6 @@ #include "ash/system/rotation/tray_rotation_lock.h" -#include "ash/common/wm_shell.h" #include "ash/display/screen_orientation_controller_chromeos.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/shell.h" @@ -16,6 +15,7 @@ #include "ash/system/tray/tray_popup_utils.h" #include "ash/system/tray/tri_view.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm_shell.h" #include "ui/accessibility/ax_node_data.h" #include "ui/base/l10n/l10n_util.h" #include "ui/display/display.h"
diff --git a/ash/system/rotation/tray_rotation_lock.h b/ash/system/rotation/tray_rotation_lock.h index 6030b3c..24e3c4f1 100644 --- a/ash/system/rotation/tray_rotation_lock.h +++ b/ash/system/rotation/tray_rotation_lock.h
@@ -5,8 +5,8 @@ #ifndef ASH_SYSTEM_ROTATION_TRAY_ROTATION_LOCK_H_ #define ASH_SYSTEM_ROTATION_TRAY_ROTATION_LOCK_H_ -#include "ash/common/shell_observer.h" #include "ash/display/screen_orientation_controller_chromeos.h" +#include "ash/shell_observer.h" #include "ash/system/tray/tray_image_item.h" #include "base/macros.h"
diff --git a/ash/system/rotation/tray_rotation_lock_unittest.cc b/ash/system/rotation/tray_rotation_lock_unittest.cc index 82e15aa..7843338 100644 --- a/ash/system/rotation/tray_rotation_lock_unittest.cc +++ b/ash/system/rotation/tray_rotation_lock_unittest.cc
@@ -6,7 +6,6 @@ #include <memory> -#include "ash/common/wm_shell.h" #include "ash/display/screen_orientation_controller_chromeos.h" #include "ash/root_window_controller.h" #include "ash/shell.h" @@ -16,6 +15,7 @@ #include "ash/test/ash_test_base.h" #include "ash/test/status_area_widget_test_helper.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm_shell.h" #include "base/command_line.h" #include "base/time/time.h" #include "ui/display/display_switches.h"
diff --git a/ash/system/screen_layout_observer.cc b/ash/system/screen_layout_observer.cc index 672a990..9044385 100644 --- a/ash/system/screen_layout_observer.cc +++ b/ash/system/screen_layout_observer.cc
@@ -8,7 +8,6 @@ #include <utility> #include <vector> -#include "ash/common/wm_shell.h" #include "ash/display/screen_orientation_controller_chromeos.h" #include "ash/metrics/user_metrics_action.h" #include "ash/resources/grit/ash_resources.h" @@ -20,6 +19,7 @@ #include "ash/system/tray/system_tray_controller.h" #include "ash/system/tray/system_tray_delegate.h" #include "ash/system/tray/tray_constants.h" +#include "ash/wm_shell.h" #include "base/bind.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/ash/system/screen_layout_observer.h b/ash/system/screen_layout_observer.h index 24943ae..d103bc62 100644 --- a/ash/system/screen_layout_observer.h +++ b/ash/system/screen_layout_observer.h
@@ -10,7 +10,7 @@ #include <map> #include "ash/ash_export.h" -#include "ash/common/wm_display_observer.h" +#include "ash/wm_display_observer.h" #include "base/macros.h" #include "base/strings/string16.h" #include "ui/display/manager/managed_display_info.h"
diff --git a/ash/system/screen_security/screen_capture_tray_item.cc b/ash/system/screen_security/screen_capture_tray_item.cc index 8628676..3bd9acb 100644 --- a/ash/system/screen_security/screen_capture_tray_item.cc +++ b/ash/system/screen_security/screen_capture_tray_item.cc
@@ -6,12 +6,12 @@ #include <utility> -#include "ash/common/wm_shell.h" #include "ash/metrics/user_metrics_action.h" #include "ash/resources/grit/ash_resources.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/system_notifier.h" #include "ash/system/tray/system_tray_notifier.h" +#include "ash/wm_shell.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/message_center/message_center.h"
diff --git a/ash/system/screen_security/screen_capture_tray_item.h b/ash/system/screen_security/screen_capture_tray_item.h index 9c6b58b7..6fdf0d70 100644 --- a/ash/system/screen_security/screen_capture_tray_item.h +++ b/ash/system/screen_security/screen_capture_tray_item.h
@@ -5,7 +5,7 @@ #ifndef ASH_SYSTEM_SCREEN_SECURITY_SCREEN_CAPTURE_TRAY_ITEM_H_ #define ASH_SYSTEM_SCREEN_SECURITY_SCREEN_CAPTURE_TRAY_ITEM_H_ -#include "ash/common/shell_observer.h" +#include "ash/shell_observer.h" #include "ash/system/screen_security/screen_capture_observer.h" #include "ash/system/screen_security/screen_tray_item.h" #include "base/macros.h"
diff --git a/ash/system/screen_security/screen_share_tray_item.cc b/ash/system/screen_security/screen_share_tray_item.cc index dc06e7f..211a2352 100644 --- a/ash/system/screen_security/screen_share_tray_item.cc +++ b/ash/system/screen_security/screen_share_tray_item.cc
@@ -6,11 +6,11 @@ #include <utility> -#include "ash/common/wm_shell.h" #include "ash/resources/grit/ash_resources.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/system_notifier.h" #include "ash/system/tray/system_tray_notifier.h" +#include "ash/wm_shell.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/message_center/message_center.h"
diff --git a/ash/system/screen_security/screen_tray_item.cc b/ash/system/screen_security/screen_tray_item.cc index 9fe53499..d6b415c 100644 --- a/ash/system/screen_security/screen_tray_item.cc +++ b/ash/system/screen_security/screen_tray_item.cc
@@ -4,7 +4,7 @@ #include "ash/system/screen_security/screen_tray_item.h" -#include "ash/common/material_design/material_design_controller.h" +#include "ash/material_design/material_design_controller.h" #include "ash/resources/grit/ash_resources.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/shelf/wm_shelf_util.h"
diff --git a/ash/system/screen_security/screen_tray_item_unittest.cc b/ash/system/screen_security/screen_tray_item_unittest.cc index 4aa4ff17..7b4380f 100644 --- a/ash/system/screen_security/screen_tray_item_unittest.cc +++ b/ash/system/screen_security/screen_tray_item_unittest.cc
@@ -4,12 +4,12 @@ #include "ash/system/screen_security/screen_tray_item.h" -#include "ash/common/wm_shell.h" #include "ash/system/screen_security/screen_capture_tray_item.h" #include "ash/system/screen_security/screen_share_tray_item.h" #include "ash/system/tray/system_tray_notifier.h" #include "ash/system/tray/tray_item_view.h" #include "ash/test/ash_test.h" +#include "ash/wm_shell.h" #include "base/callback.h" #include "base/memory/ptr_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/ash/system/session/logout_button_tray.cc b/ash/system/session/logout_button_tray.cc index ee69fc4..dcfb66f 100644 --- a/ash/system/session/logout_button_tray.cc +++ b/ash/system/session/logout_button_tray.cc
@@ -7,7 +7,6 @@ #include <memory> #include <utility> -#include "ash/common/wm_shell.h" #include "ash/public/cpp/shelf_types.h" #include "ash/resources/grit/ash_resources.h" #include "ash/resources/vector_icons/vector_icons.h" @@ -18,6 +17,7 @@ #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_utils.h" #include "ash/system/user/login_status.h" +#include "ash/wm_shell.h" #include "base/logging.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/events/event.h"
diff --git a/ash/system/session/logout_button_tray.h b/ash/system/session/logout_button_tray.h index af3d0e6..35a9e4a5 100644 --- a/ash/system/session/logout_button_tray.h +++ b/ash/system/session/logout_button_tray.h
@@ -6,7 +6,7 @@ #define ASH_SYSTEM_SESSION_LOGOUT_BUTTON_TRAY_H_ #include "ash/ash_export.h" -#include "ash/common/login_status.h" +#include "ash/login_status.h" #include "ash/system/session/logout_button_observer.h" #include "ash/system/tray/tray_background_view.h" #include "base/macros.h"
diff --git a/ash/system/session/logout_confirmation_controller.cc b/ash/system/session/logout_confirmation_controller.cc index 61bddf76..edeb2605 100644 --- a/ash/system/session/logout_confirmation_controller.cc +++ b/ash/system/session/logout_confirmation_controller.cc
@@ -6,11 +6,11 @@ #include <utility> -#include "ash/common/login_status.h" -#include "ash/common/wm_shell.h" +#include "ash/login_status.h" #include "ash/system/session/logout_confirmation_dialog.h" #include "ash/system/tray/system_tray_delegate.h" #include "ash/system/tray/system_tray_notifier.h" +#include "ash/wm_shell.h" #include "base/location.h" #include "base/time/default_tick_clock.h" #include "base/time/tick_clock.h"
diff --git a/ash/system/session/logout_confirmation_controller.h b/ash/system/session/logout_confirmation_controller.h index 1d531a89..ba2f9b5 100644 --- a/ash/system/session/logout_confirmation_controller.h +++ b/ash/system/session/logout_confirmation_controller.h
@@ -8,7 +8,7 @@ #include <memory> #include "ash/ash_export.h" -#include "ash/common/shell_observer.h" +#include "ash/shell_observer.h" #include "ash/system/session/last_window_closed_observer.h" #include "base/callback.h" #include "base/macros.h"
diff --git a/ash/system/session/logout_confirmation_dialog.cc b/ash/system/session/logout_confirmation_dialog.cc index 2eaaef2..ba8624d 100644 --- a/ash/system/session/logout_confirmation_dialog.cc +++ b/ash/system/session/logout_confirmation_dialog.cc
@@ -4,13 +4,13 @@ #include "ash/system/session/logout_confirmation_dialog.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/session/logout_confirmation_controller.h" #include "ash/system/tray/tray_constants.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/location.h" #include "base/time/tick_clock.h" #include "ui/base/l10n/l10n_util.h"
diff --git a/ash/system/session/tray_session_length_limit.cc b/ash/system/session/tray_session_length_limit.cc index 2f5e14d..bef9c818 100644 --- a/ash/system/session/tray_session_length_limit.cc +++ b/ash/system/session/tray_session_length_limit.cc
@@ -8,7 +8,6 @@ #include <memory> #include <utility> -#include "ash/common/wm_shell.h" #include "ash/resources/grit/ash_resources.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/system_notifier.h" @@ -16,6 +15,7 @@ #include "ash/system/tray/system_tray.h" #include "ash/system/tray/system_tray_delegate.h" #include "ash/system/tray/system_tray_notifier.h" +#include "ash/wm_shell.h" #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "ui/base/l10n/l10n_util.h"
diff --git a/ash/system/settings/tray_settings.cc b/ash/system/settings/tray_settings.cc index 6678414..4b4d3205 100644 --- a/ash/system/settings/tray_settings.cc +++ b/ash/system/settings/tray_settings.cc
@@ -4,10 +4,9 @@ #include "ash/system/settings/tray_settings.h" -#include "ash/common/material_design/material_design_controller.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/material_design/material_design_controller.h" #include "ash/resources/grit/ash_resources.h" +#include "ash/session/session_state_delegate.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/power/power_status.h" #include "ash/system/power/power_status_view.h" @@ -17,6 +16,7 @@ #include "ash/system/tray/system_tray_delegate.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_popup_utils.h" +#include "ash/wm_shell.h" #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "third_party/skia/include/core/SkColor.h"
diff --git a/ash/system/status_area_layout_manager.cc b/ash/system/status_area_layout_manager.cc index ec65ee2..f095995 100644 --- a/ash/system/status_area_layout_manager.cc +++ b/ash/system/status_area_layout_manager.cc
@@ -4,10 +4,10 @@ #include "ash/system/status_area_layout_manager.h" -#include "ash/common/wm_window.h" #include "ash/shelf/shelf_layout_manager.h" #include "ash/shelf/shelf_widget.h" #include "ash/system/status_area_widget.h" +#include "ash/wm_window.h" #include "base/auto_reset.h" namespace ash {
diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc index dd27eae..6cbd6b26 100644 --- a/ash/system/status_area_widget.cc +++ b/ash/system/status_area_widget.cc
@@ -4,9 +4,7 @@ #include "ash/system/status_area_widget.h" -#include "ash/common/material_design/material_design_controller.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/material_design/material_design_controller.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/shelf/wm_shelf.h" @@ -20,6 +18,8 @@ #include "ash/system/tray/system_tray_delegate.h" #include "ash/system/virtual_keyboard/virtual_keyboard_tray.h" #include "ash/system/web_notification/web_notification_tray.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/i18n/time_formatting.h" #include "ui/display/display.h" #include "ui/native_theme/native_theme_dark_aura.h"
diff --git a/ash/system/status_area_widget.h b/ash/system/status_area_widget.h index dcdb5bf..c4cd26f 100644 --- a/ash/system/status_area_widget.h +++ b/ash/system/status_area_widget.h
@@ -6,7 +6,7 @@ #define ASH_SYSTEM_STATUS_AREA_WIDGET_H_ #include "ash/ash_export.h" -#include "ash/common/login_status.h" +#include "ash/login_status.h" #include "ash/public/cpp/shelf_types.h" #include "ash/shelf/shelf_background_animator_observer.h" #include "base/macros.h"
diff --git a/ash/system/status_area_widget_delegate.cc b/ash/system/status_area_widget_delegate.cc index 21c942e..e3e0c82 100644 --- a/ash/system/status_area_widget_delegate.cc +++ b/ash/system/status_area_widget_delegate.cc
@@ -4,14 +4,14 @@ #include "ash/system/status_area_widget_delegate.h" -#include "ash/common/focus_cycler.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/focus_cycler.h" #include "ash/root_window_controller.h" #include "ash/shelf/shelf_constants.h" #include "ash/shelf/wm_shelf.h" #include "ash/shelf/wm_shelf_util.h" #include "ash/system/tray/tray_constants.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/animation/tween.h"
diff --git a/ash/system/supervised/tray_supervised_user.cc b/ash/system/supervised/tray_supervised_user.cc index cd6b0a7..7aac7f19 100644 --- a/ash/system/supervised/tray_supervised_user.cc +++ b/ash/system/supervised/tray_supervised_user.cc
@@ -6,12 +6,12 @@ #include <utility> -#include "ash/common/login_status.h" -#include "ash/common/wm_shell.h" +#include "ash/login_status.h" #include "ash/resources/grit/ash_resources.h" #include "ash/system/system_notifier.h" #include "ash/system/tray/label_tray_view.h" #include "ash/system/tray/system_tray_delegate.h" +#include "ash/wm_shell.h" #include "base/callback.h" #include "base/logging.h" #include "ui/base/resource/resource_bundle.h"
diff --git a/ash/system/supervised/tray_supervised_user_unittest.cc b/ash/system/supervised/tray_supervised_user_unittest.cc index 2b666d3..61d3d48 100644 --- a/ash/system/supervised/tray_supervised_user_unittest.cc +++ b/ash/system/supervised/tray_supervised_user_unittest.cc
@@ -4,7 +4,7 @@ #include "ash/system/supervised/tray_supervised_user.h" -#include "ash/common/login_status.h" +#include "ash/login_status.h" #include "ash/test/ash_test.h" #include "ash/test/test_system_tray_delegate.h" #include "ui/message_center/message_center.h"
diff --git a/ash/system/system_clock_observer.cc b/ash/system/system_clock_observer.cc index 6caaffa9..07cac83 100644 --- a/ash/system/system_clock_observer.cc +++ b/ash/system/system_clock_observer.cc
@@ -4,8 +4,8 @@ #include "ash/system/system_clock_observer.h" -#include "ash/common/wm_shell.h" #include "ash/system/tray/system_tray_notifier.h" +#include "ash/wm_shell.h" #include "chromeos/dbus/dbus_thread_manager.h" namespace ash {
diff --git a/ash/system/tiles/tiles_default_view.cc b/ash/system/tiles/tiles_default_view.cc index d12e5ccf..cd3777e2 100644 --- a/ash/system/tiles/tiles_default_view.cc +++ b/ash/system/tiles/tiles_default_view.cc
@@ -4,12 +4,11 @@ #include "ash/system/tiles/tiles_default_view.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/shutdown_controller.h" -#include "ash/common/wm_shell.h" #include "ash/metrics/user_metrics_action.h" #include "ash/resources/vector_icons/vector_icons.h" +#include "ash/session/session_state_delegate.h" #include "ash/shell.h" +#include "ash/shutdown_controller.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/tray/system_menu_button.h" #include "ash/system/tray/system_tray.h" @@ -19,6 +18,7 @@ #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_popup_utils.h" #include "ash/wm/lock_state_controller.h" +#include "ash/wm_shell.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/session_manager_client.h" #include "ui/base/l10n/l10n_util.h"
diff --git a/ash/system/tiles/tiles_default_view.h b/ash/system/tiles/tiles_default_view.h index d719b623..075e7aa 100644 --- a/ash/system/tiles/tiles_default_view.h +++ b/ash/system/tiles/tiles_default_view.h
@@ -6,7 +6,7 @@ #define ASH_SYSTEM_TILES_TILES_DEFAULT_VIEW_H_ #include "ash/ash_export.h" -#include "ash/common/login_status.h" +#include "ash/login_status.h" #include "base/macros.h" #include "ui/views/controls/button/button.h" #include "ui/views/view.h"
diff --git a/ash/system/tiles/tray_tiles.cc b/ash/system/tiles/tray_tiles.cc index ea1b5cc..832a4151f 100644 --- a/ash/system/tiles/tray_tiles.cc +++ b/ash/system/tiles/tray_tiles.cc
@@ -4,10 +4,10 @@ #include "ash/system/tiles/tray_tiles.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" #include "ash/metrics/user_metrics_action.h" +#include "ash/session/session_state_delegate.h" #include "ash/system/tiles/tiles_default_view.h" +#include "ash/wm_shell.h" namespace ash {
diff --git a/ash/system/tiles/tray_tiles_unittest.cc b/ash/system/tiles/tray_tiles_unittest.cc index b26b4ec..2e17978 100644 --- a/ash/system/tiles/tray_tiles_unittest.cc +++ b/ash/system/tiles/tray_tiles_unittest.cc
@@ -4,10 +4,10 @@ #include "ash/system/tiles/tray_tiles.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/session/session_state_delegate.h" #include "ash/system/tiles/tiles_default_view.h" #include "ash/test/ash_test_base.h" +#include "ash/wm_shell.h" #include "ui/views/controls/button/custom_button.h" #include "ui/views/view.h"
diff --git a/ash/system/toast/toast_manager_unittest.cc b/ash/system/toast/toast_manager_unittest.cc index 1518d86..47528d89 100644 --- a/ash/system/toast/toast_manager_unittest.cc +++ b/ash/system/toast/toast_manager_unittest.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm_shell.h" #include "ash/shelf/shelf_constants.h" #include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/system/toast/toast_manager.h" #include "ash/test/ash_test_base.h" #include "ash/wm/wm_screen_util.h" +#include "ash/wm_shell.h" #include "base/run_loop.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h"
diff --git a/ash/system/toast/toast_overlay.cc b/ash/system/toast/toast_overlay.cc index ab1885ae..e2358ec 100644 --- a/ash/system/toast/toast_overlay.cc +++ b/ash/system/toast/toast_overlay.cc
@@ -4,12 +4,12 @@ #include "ash/system/toast/toast_overlay.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/shelf/wm_shelf.h" #include "ash/strings/grit/ash_strings.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/ash/system/tray/actionable_view.cc b/ash/system/tray/actionable_view.cc index 7914f5a..ccb3d86 100644 --- a/ash/system/tray/actionable_view.cc +++ b/ash/system/tray/actionable_view.cc
@@ -4,7 +4,7 @@ #include "ash/system/tray/actionable_view.h" -#include "ash/common/ash_constants.h" +#include "ash/ash_constants.h" #include "ash/system/tray/system_tray.h" #include "ash/system/tray/system_tray_item.h" #include "ash/system/tray/tray_constants.h"
diff --git a/ash/system/tray/hover_highlight_view.cc b/ash/system/tray/hover_highlight_view.cc index 47322ce3..5d6dcb0 100644 --- a/ash/system/tray/hover_highlight_view.cc +++ b/ash/system/tray/hover_highlight_view.cc
@@ -4,7 +4,7 @@ #include "ash/system/tray/hover_highlight_view.h" -#include "ash/common/material_design/material_design_controller.h" +#include "ash/material_design/material_design_controller.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/system/tray/fixed_sized_image_view.h" #include "ash/system/tray/tray_constants.h"
diff --git a/ash/system/tray/label_tray_view.cc b/ash/system/tray/label_tray_view.cc index 518c633..40494f8 100644 --- a/ash/system/tray/label_tray_view.cc +++ b/ash/system/tray/label_tray_view.cc
@@ -4,7 +4,7 @@ #include "ash/system/tray/label_tray_view.h" -#include "ash/common/material_design/material_design_controller.h" +#include "ash/material_design/material_design_controller.h" #include "ash/resources/grit/ash_resources.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/system/tray/hover_highlight_view.h"
diff --git a/ash/system/tray/special_popup_row.cc b/ash/system/tray/special_popup_row.cc index 966b35b..41199a7 100644 --- a/ash/system/tray/special_popup_row.cc +++ b/ash/system/tray/special_popup_row.cc
@@ -4,8 +4,8 @@ #include "ash/system/tray/special_popup_row.h" -#include "ash/common/ash_constants.h" -#include "ash/common/material_design/material_design_controller.h" +#include "ash/ash_constants.h" +#include "ash/material_design/material_design_controller.h" #include "ash/resources/grit/ash_resources.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/tray/hover_highlight_view.h"
diff --git a/ash/system/tray/special_popup_row.h b/ash/system/tray/special_popup_row.h index 4df1bd6..8445540 100644 --- a/ash/system/tray/special_popup_row.h +++ b/ash/system/tray/special_popup_row.h
@@ -6,7 +6,7 @@ #define ASH_SYSTEM_TRAY_SPECIAL_POPUP_ROW_H_ #include "ash/ash_export.h" -#include "ash/common/login_status.h" +#include "ash/login_status.h" #include "ash/resources/vector_icons/vector_icons.h" #include "base/macros.h" #include "ui/gfx/geometry/size.h"
diff --git a/ash/system/tray/system_menu_button.cc b/ash/system/tray/system_menu_button.cc index 3557fd43..8afd07b1 100644 --- a/ash/system/tray/system_menu_button.cc +++ b/ash/system/tray/system_menu_button.cc
@@ -4,7 +4,7 @@ #include "ash/system/tray/system_menu_button.h" -#include "ash/common/ash_constants.h" +#include "ash/ash_constants.h" #include "ash/system/tray/system_tray.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_popup_utils.h"
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc index 3bad616..fccdae7 100644 --- a/ash/system/tray/system_tray.cc +++ b/ash/system/tray/system_tray.cc
@@ -8,15 +8,12 @@ #include <map> #include <vector> -#include "ash/common/key_event_watcher.h" -#include "ash/common/login_status.h" -#include "ash/common/material_design/material_design_controller.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_activation_observer.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/key_event_watcher.h" +#include "ash/login_status.h" +#include "ash/material_design/material_design_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/wm_shelf.h" #include "ash/shelf/wm_shelf_util.h" #include "ash/strings/grit/ash_strings.h" @@ -51,6 +48,9 @@ #include "ash/system/user/tray_user.h" #include "ash/system/web_notification/web_notification_tray.h" #include "ash/wm/container_finder.h" +#include "ash/wm_activation_observer.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h"
diff --git a/ash/system/tray/system_tray_bubble.cc b/ash/system/tray/system_tray_bubble.cc index f4e96569..ee18ffe 100644 --- a/ash/system/tray/system_tray_bubble.cc +++ b/ash/system/tray/system_tray_bubble.cc
@@ -7,14 +7,14 @@ #include <utility> #include <vector> -#include "ash/common/material_design/material_design_controller.h" -#include "ash/common/wm_shell.h" +#include "ash/material_design/material_design_controller.h" #include "ash/system/tray/system_tray.h" #include "ash/system/tray/system_tray_delegate.h" #include "ash/system/tray/system_tray_item.h" #include "ash/system/tray/tray_bubble_wrapper.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_popup_item_container.h" +#include "ash/wm_shell.h" #include "base/metrics/histogram_macros.h" #include "base/threading/thread_task_runner_handle.h" #include "ui/compositor/layer.h"
diff --git a/ash/system/tray/system_tray_bubble.h b/ash/system/tray/system_tray_bubble.h index f7f9687a..4e4c519 100644 --- a/ash/system/tray/system_tray_bubble.h +++ b/ash/system/tray/system_tray_bubble.h
@@ -9,7 +9,7 @@ #include <memory> #include <vector> -#include "ash/common/login_status.h" +#include "ash/login_status.h" #include "ash/system/tray/system_tray_item.h" #include "base/macros.h" #include "base/timer/timer.h"
diff --git a/ash/system/tray/system_tray_controller.cc b/ash/system/tray/system_tray_controller.cc index 2432aeff..c4e03ea5 100644 --- a/ash/system/tray/system_tray_controller.cc +++ b/ash/system/tray/system_tray_controller.cc
@@ -4,12 +4,12 @@ #include "ash/system/tray/system_tray_controller.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/root_window_controller.h" #include "ash/system/tray/system_tray.h" #include "ash/system/tray/system_tray_notifier.h" #include "ash/system/update/tray_update.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" namespace ash {
diff --git a/ash/system/tray/system_tray_delegate.h b/ash/system/tray/system_tray_delegate.h index 509fc04..a5c998d 100644 --- a/ash/system/tray/system_tray_delegate.h +++ b/ash/system/tray/system_tray_delegate.h
@@ -10,7 +10,7 @@ #include <vector> #include "ash/ash_export.h" -#include "ash/common/login_status.h" +#include "ash/login_status.h" #include "base/callback_forward.h" #include "base/files/file_path.h" #include "base/i18n/time_formatting.h"
diff --git a/ash/system/tray/system_tray_item.h b/ash/system/tray/system_tray_item.h index 087fb40..4641b8b1 100644 --- a/ash/system/tray/system_tray_item.h +++ b/ash/system/tray/system_tray_item.h
@@ -8,7 +8,7 @@ #include <memory> #include "ash/ash_export.h" -#include "ash/common/login_status.h" +#include "ash/login_status.h" #include "ash/public/cpp/shelf_types.h" #include "base/macros.h" #include "base/timer/timer.h"
diff --git a/ash/system/tray/system_tray_notifier.h b/ash/system/tray/system_tray_notifier.h index 945a299c..f75e512 100644 --- a/ash/system/tray/system_tray_notifier.h +++ b/ash/system/tray/system_tray_notifier.h
@@ -7,8 +7,8 @@ #include <string> +#include "ash/accessibility_types.h" #include "ash/ash_export.h" -#include "ash/common/accessibility_types.h" #include "base/callback_forward.h" #include "base/macros.h" #include "base/observer_list.h"
diff --git a/ash/system/tray/system_tray_unittest.cc b/ash/system/tray/system_tray_unittest.cc index 62c8d95..a124170 100644 --- a/ash/system/tray/system_tray_unittest.cc +++ b/ash/system/tray/system_tray_unittest.cc
@@ -8,9 +8,7 @@ #include <vector> #include "ash/accelerators/accelerator_controller.h" -#include "ash/common/accessibility_delegate.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/accessibility_delegate.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/shelf/wm_shelf.h" @@ -23,6 +21,8 @@ #include "ash/test/ash_test_base.h" #include "ash/test/status_area_widget_test_helper.h" #include "ash/test/test_system_tray_item.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/test/histogram_tester.h"
diff --git a/ash/system/tray/tray_background_view.cc b/ash/system/tray/tray_background_view.cc index 326c4a2..1d3c1fe 100644 --- a/ash/system/tray/tray_background_view.cc +++ b/ash/system/tray/tray_background_view.cc
@@ -6,10 +6,8 @@ #include <algorithm> -#include "ash/common/ash_constants.h" -#include "ash/common/material_design/material_design_controller.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/ash_constants.h" +#include "ash/material_design/material_design_controller.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/resources/grit/ash_resources.h" #include "ash/shelf/shelf_constants.h" @@ -18,6 +16,8 @@ #include "ash/system/tray/system_tray.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_event_filter.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/memory/ptr_util.h" #include "ui/accessibility/ax_node_data.h" #include "ui/base/nine_image_painter_factory.h"
diff --git a/ash/system/tray/tray_bubble_wrapper.cc b/ash/system/tray/tray_bubble_wrapper.cc index df43f91..81bd818 100644 --- a/ash/system/tray/tray_bubble_wrapper.cc +++ b/ash/system/tray/tray_bubble_wrapper.cc
@@ -4,9 +4,9 @@ #include "ash/system/tray/tray_bubble_wrapper.h" -#include "ash/common/wm_window.h" #include "ash/system/tray/tray_background_view.h" #include "ash/system/tray/tray_event_filter.h" +#include "ash/wm_window.h" #include "ui/views/bubble/tray_bubble_view.h" #include "ui/views/widget/widget.h"
diff --git a/ash/system/tray/tray_details_view.cc b/ash/system/tray/tray_details_view.cc index 54f83fab..71b29c4 100644 --- a/ash/system/tray/tray_details_view.cc +++ b/ash/system/tray/tray_details_view.cc
@@ -4,8 +4,8 @@ #include "ash/system/tray/tray_details_view.h" -#include "ash/common/ash_view_ids.h" -#include "ash/common/material_design/material_design_controller.h" +#include "ash/ash_view_ids.h" +#include "ash/material_design/material_design_controller.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/tray/system_menu_button.h" #include "ash/system/tray/system_tray.h"
diff --git a/ash/system/tray/tray_details_view_unittest.cc b/ash/system/tray/tray_details_view_unittest.cc index 42b150a..14746b5b 100644 --- a/ash/system/tray/tray_details_view_unittest.cc +++ b/ash/system/tray/tray_details_view_unittest.cc
@@ -4,7 +4,7 @@ #include "ash/system/tray/tray_details_view.h" -#include "ash/common/ash_view_ids.h" +#include "ash/ash_view_ids.h" #include "ash/resources/grit/ash_resources.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/tray/hover_highlight_view.h"
diff --git a/ash/system/tray/tray_event_filter.cc b/ash/system/tray/tray_event_filter.cc index 3d6d7a1..2b5e873c 100644 --- a/ash/system/tray/tray_event_filter.cc +++ b/ash/system/tray/tray_event_filter.cc
@@ -4,12 +4,12 @@ #include "ash/system/tray/tray_event_filter.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/system/tray/tray_background_view.h" #include "ash/system/tray/tray_bubble_wrapper.h" #include "ash/wm/container_finder.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/views/widget/widget.h" namespace ash {
diff --git a/ash/system/tray/tray_item_view.cc b/ash/system/tray/tray_item_view.cc index 32597ce..431a3b6 100644 --- a/ash/system/tray/tray_item_view.cc +++ b/ash/system/tray/tray_item_view.cc
@@ -4,7 +4,7 @@ #include "ash/system/tray/tray_item_view.h" -#include "ash/common/material_design/material_design_controller.h" +#include "ash/material_design/material_design_controller.h" #include "ash/public/cpp/shelf_types.h" #include "ash/shelf/wm_shelf_util.h" #include "ash/system/tray/system_tray.h"
diff --git a/ash/system/tray/tray_popup_header_button.cc b/ash/system/tray/tray_popup_header_button.cc index 146dc0e..47c5d880 100644 --- a/ash/system/tray/tray_popup_header_button.cc +++ b/ash/system/tray/tray_popup_header_button.cc
@@ -4,7 +4,7 @@ #include "ash/system/tray/tray_popup_header_button.h" -#include "ash/common/ash_constants.h" +#include "ash/ash_constants.h" #include "ash/system/tray/tray_constants.h" #include "ui/base/resource/resource_bundle.h" #include "ui/views/background.h"
diff --git a/ash/system/tray/tray_popup_utils.cc b/ash/system/tray/tray_popup_utils.cc index 8393e04..a431b999 100644 --- a/ash/system/tray/tray_popup_utils.cc +++ b/ash/system/tray/tray_popup_utils.cc
@@ -7,15 +7,15 @@ #include <algorithm> #include <utility> -#include "ash/common/ash_constants.h" -#include "ash/common/ash_view_ids.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/ash_constants.h" +#include "ash/ash_view_ids.h" #include "ash/resources/vector_icons/vector_icons.h" +#include "ash/session/session_state_delegate.h" #include "ash/system/tray/fixed_sized_image_view.h" #include "ash/system/tray/size_range_layout.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_popup_item_style.h" +#include "ash/wm_shell.h" #include "base/memory/ptr_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/paint_vector_icon.h"
diff --git a/ash/system/tray/tray_popup_utils.h b/ash/system/tray/tray_popup_utils.h index 53c1ea8..b956810 100644 --- a/ash/system/tray/tray_popup_utils.h +++ b/ash/system/tray/tray_popup_utils.h
@@ -7,7 +7,7 @@ #include <memory> -#include "ash/common/login_status.h" +#include "ash/login_status.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_popup_ink_drop_style.h" #include "ash/system/tray/tri_view.h"
diff --git a/ash/system/tray/tray_utils.cc b/ash/system/tray/tray_utils.cc index 5a42c80..66c9173 100644 --- a/ash/system/tray/tray_utils.cc +++ b/ash/system/tray/tray_utils.cc
@@ -4,7 +4,7 @@ #include "ash/system/tray/tray_utils.h" -#include "ash/common/material_design/material_design_controller.h" +#include "ash/material_design/material_design_controller.h" #include "ash/shelf/wm_shelf_util.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_item_view.h"
diff --git a/ash/system/tray_accessibility.cc b/ash/system/tray_accessibility.cc index 901c25b0..43acf75 100644 --- a/ash/system/tray_accessibility.cc +++ b/ash/system/tray_accessibility.cc
@@ -4,12 +4,11 @@ #include "ash/system/tray_accessibility.h" -#include "ash/common/accessibility_delegate.h" -#include "ash/common/accessibility_types.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/accessibility_delegate.h" +#include "ash/accessibility_types.h" #include "ash/resources/grit/ash_resources.h" #include "ash/resources/vector_icons/vector_icons.h" +#include "ash/session/session_state_delegate.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/tray/hover_highlight_view.h" #include "ash/system/tray/system_tray.h" @@ -22,6 +21,7 @@ #include "ash/system/tray/tray_popup_item_style.h" #include "ash/system/tray/tray_popup_utils.h" #include "ash/system/tray/tri_view.h" +#include "ash/wm_shell.h" #include "base/strings/utf_string_conversions.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h"
diff --git a/ash/system/tray_accessibility.h b/ash/system/tray_accessibility.h index bf28c1b..0775c79a 100644 --- a/ash/system/tray_accessibility.h +++ b/ash/system/tray_accessibility.h
@@ -7,8 +7,8 @@ #include <stdint.h> -#include "ash/common/accessibility_delegate.h" -#include "ash/common/shell_observer.h" +#include "ash/accessibility_delegate.h" +#include "ash/shell_observer.h" #include "ash/system/accessibility_observer.h" #include "ash/system/tray/tray_details_view.h" #include "ash/system/tray/tray_image_item.h"
diff --git a/ash/system/tray_caps_lock.cc b/ash/system/tray_caps_lock.cc index e918f48..b8e5ab39 100644 --- a/ash/system/tray_caps_lock.cc +++ b/ash/system/tray_caps_lock.cc
@@ -4,8 +4,7 @@ #include "ash/system/tray_caps_lock.h" -#include "ash/common/accessibility_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/accessibility_delegate.h" #include "ash/resources/grit/ash_resources.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/strings/grit/ash_strings.h" @@ -15,6 +14,7 @@ #include "ash/system/tray/tray_popup_item_style.h" #include "ash/system/tray/tray_popup_utils.h" #include "ash/system/tray/tri_view.h" +#include "ash/wm_shell.h" #include "base/sys_info.h" #include "ui/accessibility/ax_node_data.h" #include "ui/base/ime/chromeos/ime_keyboard.h"
diff --git a/ash/system/tray_tracing.cc b/ash/system/tray_tracing.cc index 1f787ea8..853d112 100644 --- a/ash/system/tray_tracing.cc +++ b/ash/system/tray_tracing.cc
@@ -4,7 +4,6 @@ #include "ash/system/tray_tracing.h" -#include "ash/common/wm_shell.h" #include "ash/metrics/user_metrics_action.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/strings/grit/ash_strings.h" @@ -17,6 +16,7 @@ #include "ash/system/tray/tray_popup_item_style.h" #include "ash/system/tray/tray_popup_utils.h" #include "ash/system/tray/tri_view.h" +#include "ash/wm_shell.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/image/image.h" #include "ui/gfx/paint_vector_icon.h"
diff --git a/ash/system/update/tray_update.cc b/ash/system/update/tray_update.cc index ccbb434..787442e 100644 --- a/ash/system/update/tray_update.cc +++ b/ash/system/update/tray_update.cc
@@ -4,7 +4,6 @@ #include "ash/system/update/tray_update.h" -#include "ash/common/wm_shell.h" #include "ash/metrics/user_metrics_action.h" #include "ash/public/interfaces/update.mojom.h" #include "ash/resources/vector_icons/vector_icons.h" @@ -16,6 +15,7 @@ #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_popup_item_style.h" #include "ash/system/tray/tray_popup_utils.h" +#include "ash/wm_shell.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/color_palette.h" #include "ui/gfx/image/image.h"
diff --git a/ash/system/update/tray_update_unittest.cc b/ash/system/update/tray_update_unittest.cc index c33947f..135da515 100644 --- a/ash/system/update/tray_update_unittest.cc +++ b/ash/system/update/tray_update_unittest.cc
@@ -4,11 +4,11 @@ #include "ash/system/update/tray_update.h" -#include "ash/common/wm_shell.h" #include "ash/public/interfaces/update.mojom.h" #include "ash/system/tray/system_tray.h" #include "ash/system/tray/system_tray_controller.h" #include "ash/test/ash_test.h" +#include "ash/wm_shell.h" namespace ash {
diff --git a/ash/system/user/button_from_view.cc b/ash/system/user/button_from_view.cc index a7e1ea99..21af144 100644 --- a/ash/system/user/button_from_view.cc +++ b/ash/system/user/button_from_view.cc
@@ -6,7 +6,7 @@ #include <vector> -#include "ash/common/ash_constants.h" +#include "ash/ash_constants.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_popup_utils.h" #include "base/strings/string_util.h"
diff --git a/ash/system/user/login_status.cc b/ash/system/user/login_status.cc index d129034..b0b14f8 100644 --- a/ash/system/user/login_status.cc +++ b/ash/system/user/login_status.cc
@@ -4,9 +4,9 @@ #include "ash/system/user/login_status.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/session/session_state_delegate.h" #include "ash/strings/grit/ash_strings.h" +#include "ash/wm_shell.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "ui/base/resource/resource_bundle.h"
diff --git a/ash/system/user/login_status.h b/ash/system/user/login_status.h index 672389a..18f3e24 100644 --- a/ash/system/user/login_status.h +++ b/ash/system/user/login_status.h
@@ -5,7 +5,7 @@ #ifndef ASH_SYSTEM_USER_LOGIN_STATUS_H_ #define ASH_SYSTEM_USER_LOGIN_STATUS_H_ -#include "ash/common/login_status.h" +#include "ash/login_status.h" #include "base/strings/string16.h" namespace ash {
diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc index 0dfa5233..0afde69 100644 --- a/ash/system/user/tray_user.cc +++ b/ash/system/user/tray_user.cc
@@ -4,8 +4,7 @@ #include "ash/system/user/tray_user.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/session/session_state_delegate.h" #include "ash/shelf/wm_shelf_util.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/tray/system_tray.h" @@ -16,6 +15,7 @@ #include "ash/system/tray/tray_utils.h" #include "ash/system/user/rounded_image_view.h" #include "ash/system/user/user_view.h" +#include "ash/wm_shell.h" #include "base/logging.h" #include "base/strings/string16.h" #include "components/signin/core/account_id/account_id.h"
diff --git a/ash/system/user/tray_user_unittest.cc b/ash/system/user/tray_user_unittest.cc index cb3bceb..e09673a 100644 --- a/ash/system/user/tray_user_unittest.cc +++ b/ash/system/user/tray_user_unittest.cc
@@ -4,8 +4,7 @@ #include <vector> -#include "ash/common/shell_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/shell_delegate.h" #include "ash/system/tray/system_tray.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/user/tray_user.h" @@ -14,6 +13,7 @@ #include "ash/test/ash_test_helper.h" #include "ash/test/test_session_state_delegate.h" #include "ash/test/test_shell_delegate.h" +#include "ash/wm_shell.h" #include "base/memory/ptr_util.h" #include "base/strings/utf_string_conversions.h" #include "components/signin/core/account_id/account_id.h"
diff --git a/ash/system/user/user_card_view.cc b/ash/system/user/user_card_view.cc index ddc8c72..1458b219 100644 --- a/ash/system/user/user_card_view.cc +++ b/ash/system/user/user_card_view.cc
@@ -8,18 +8,18 @@ #include <memory> #include <vector> -#include "ash/common/ash_view_ids.h" -#include "ash/common/login_status.h" -#include "ash/common/media_controller.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/ash_view_ids.h" +#include "ash/login_status.h" +#include "ash/media_controller.h" #include "ash/resources/vector_icons/vector_icons.h" +#include "ash/session/session_state_delegate.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/tray/system_tray_controller.h" #include "ash/system/tray/system_tray_delegate.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_popup_item_style.h" #include "ash/system/user/rounded_image_view.h" +#include "ash/wm_shell.h" #include "base/i18n/rtl.h" #include "base/memory/ptr_util.h" #include "base/strings/string16.h"
diff --git a/ash/system/user/user_card_view.h b/ash/system/user/user_card_view.h index 14a26e4..75d69b1 100644 --- a/ash/system/user/user_card_view.h +++ b/ash/system/user/user_card_view.h
@@ -5,7 +5,7 @@ #ifndef ASH_SYSTEM_USER_USER_CARD_VIEW_H_ #define ASH_SYSTEM_USER_USER_CARD_VIEW_H_ -#include "ash/common/media_controller.h" +#include "ash/media_controller.h" #include "base/macros.h" #include "ui/views/view.h"
diff --git a/ash/system/user/user_view.cc b/ash/system/user/user_view.cc index ccddef0..5deabc4d 100644 --- a/ash/system/user/user_view.cc +++ b/ash/system/user/user_view.cc
@@ -7,15 +7,13 @@ #include <algorithm> #include <utility> -#include "ash/common/multi_profile_uma.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/multi_profile_uma.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/resources/grit/ash_resources.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/root_window_controller.h" +#include "ash/session/session_state_delegate.h" +#include "ash/shell_delegate.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/tray/system_tray.h" #include "ash/system/tray/system_tray_controller.h" @@ -27,6 +25,8 @@ #include "ash/system/user/login_status.h" #include "ash/system/user/rounded_image_view.h" #include "ash/system/user/user_card_view.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/memory/ptr_util.h" #include "components/signin/core/account_id/account_id.h" #include "components/user_manager/user_info.h"
diff --git a/ash/system/virtual_keyboard/virtual_keyboard_tray.cc b/ash/system/virtual_keyboard/virtual_keyboard_tray.cc index 19e60ec..894feee 100644 --- a/ash/system/virtual_keyboard/virtual_keyboard_tray.cc +++ b/ash/system/virtual_keyboard/virtual_keyboard_tray.cc
@@ -6,14 +6,14 @@ #include <algorithm> -#include "ash/common/keyboard/keyboard_ui.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/keyboard/keyboard_ui.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/shelf/shelf_constants.h" #include "ash/shelf/wm_shelf.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/tray/tray_constants.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/base/l10n/l10n_util.h" #include "ui/display/display.h" #include "ui/events/event.h"
diff --git a/ash/system/virtual_keyboard/virtual_keyboard_tray.h b/ash/system/virtual_keyboard/virtual_keyboard_tray.h index 1572e3d..df8bad6d 100644 --- a/ash/system/virtual_keyboard/virtual_keyboard_tray.h +++ b/ash/system/virtual_keyboard/virtual_keyboard_tray.h
@@ -5,7 +5,7 @@ #ifndef ASH_SYSTEM_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_ #define ASH_SYSTEM_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_ -#include "ash/common/keyboard/keyboard_ui_observer.h" +#include "ash/keyboard/keyboard_ui_observer.h" #include "ash/system/tray/tray_background_view.h" #include "base/macros.h" #include "ui/keyboard/keyboard_controller_observer.h"
diff --git a/ash/system/web_notification/ash_popup_alignment_delegate.cc b/ash/system/web_notification/ash_popup_alignment_delegate.cc index 0d33b7bc..9b3e5c3d 100644 --- a/ash/system/web_notification/ash_popup_alignment_delegate.cc +++ b/ash/system/web_notification/ash_popup_alignment_delegate.cc
@@ -4,13 +4,13 @@ #include "ash/system/web_notification/ash_popup_alignment_delegate.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shelf_types.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/shelf/shelf_constants.h" #include "ash/shelf/wm_shelf.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/i18n/rtl.h" #include "ui/display/display.h" #include "ui/display/screen.h"
diff --git a/ash/system/web_notification/ash_popup_alignment_delegate.h b/ash/system/web_notification/ash_popup_alignment_delegate.h index d8e41b4..93db7bc 100644 --- a/ash/system/web_notification/ash_popup_alignment_delegate.h +++ b/ash/system/web_notification/ash_popup_alignment_delegate.h
@@ -8,9 +8,9 @@ #include <stdint.h> #include "ash/ash_export.h" -#include "ash/common/shell_observer.h" #include "ash/public/cpp/shelf_types.h" #include "ash/shelf/wm_shelf_observer.h" +#include "ash/shell_observer.h" #include "base/macros.h" #include "ui/display/display_observer.h" #include "ui/gfx/geometry/rect.h"
diff --git a/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc b/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc index 56ff6e9..123c02a 100644 --- a/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc +++ b/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc
@@ -7,14 +7,14 @@ #include <utility> #include <vector> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shelf_types.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "base/memory/ptr_util.h" #include "ui/display/manager/display_manager.h"
diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc index 8e6c79df..35eb2ed 100644 --- a/ash/system/web_notification/web_notification_tray.cc +++ b/ash/system/web_notification/web_notification_tray.cc
@@ -4,13 +4,11 @@ #include "ash/system/web_notification/web_notification_tray.h" -#include "ash/common/material_design/material_design_controller.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/material_design/material_design_controller.h" #include "ash/public/cpp/shell_window_ids.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_constants.h" #include "ash/shelf/wm_shelf.h" #include "ash/shelf/wm_shelf_util.h" @@ -22,6 +20,8 @@ #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_utils.h" #include "ash/system/web_notification/ash_popup_alignment_delegate.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/auto_reset.h" #include "base/i18n/number_formatting.h" #include "base/i18n/rtl.h"
diff --git a/ash/system/web_notification/web_notification_tray.h b/ash/system/web_notification/web_notification_tray.h index da07447..920baa4 100644 --- a/ash/system/web_notification/web_notification_tray.h +++ b/ash/system/web_notification/web_notification_tray.h
@@ -8,7 +8,7 @@ #include <memory> #include "ash/ash_export.h" -#include "ash/common/login_status.h" +#include "ash/login_status.h" #include "ash/system/tray/tray_background_view.h" #include "base/gtest_prod_util.h" #include "base/macros.h"
diff --git a/ash/system/web_notification/web_notification_tray_unittest.cc b/ash/system/web_notification/web_notification_tray_unittest.cc index 4a00585..9ee1ecd 100644 --- a/ash/system/web_notification/web_notification_tray_unittest.cc +++ b/ash/system/web_notification/web_notification_tray_unittest.cc
@@ -7,8 +7,6 @@ #include <utility> #include <vector> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shelf/shelf_layout_manager.h" #include "ash/shelf/wm_shelf.h" @@ -22,6 +20,8 @@ #include "ash/test/status_area_widget_test_helper.h" #include "ash/test/test_system_tray_delegate.h" #include "ash/wm/window_state.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/memory/ptr_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/ash/test/ash_test.cc b/ash/test/ash_test.cc index f3d7072..13af7c0 100644 --- a/ash/test/ash_test.cc +++ b/ash/test/ash_test.cc
@@ -4,14 +4,14 @@ #include "ash/test/ash_test.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/root_window_controller.h" #include "ash/shelf/wm_shelf.h" #include "ash/system/status_area_widget.h" #include "ash/test/ash_test_impl.h" #include "ash/test/test_session_state_delegate.h" #include "ash/test/test_system_tray_delegate.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "ui/compositor/layer_type.h"
diff --git a/ash/test/ash_test.h b/ash/test/ash_test.h index 0eccb70d..61b542a 100644 --- a/ash/test/ash_test.h +++ b/ash/test/ash_test.h
@@ -55,7 +55,7 @@ // Base class for ash tests. This class calls through to AshTestImpl for the // real implementation. This class exists so that tests can be written to -// ash/common and run in both mus and aura. +// run in both mus ash and classic ash. // // The implementation of AshTestImpl that is used depends upon gn targets. To // use the aura backend depend on "//ash/test:ash_with_aura_test_support." The
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc index 32fc673..a02008c 100644 --- a/ash/test/ash_test_base.cc +++ b/ash/test/ash_test_base.cc
@@ -7,8 +7,6 @@ #include <string> #include <vector> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/display/extended_mouse_warp_controller.h" #include "ash/display/mouse_cursor_event_filter.h" #include "ash/display/unified_mouse_warp_controller.h" @@ -23,6 +21,8 @@ #include "ash/test/test_shell_delegate.h" #include "ash/test/test_system_tray_delegate.h" #include "ash/wm/window_positioner.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "services/ui/public/interfaces/window_manager_constants.mojom.h" #include "ui/aura/client/aura_constants.h"
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc index 1ed61fa..0026774 100644 --- a/ash/test/ash_test_helper.cc +++ b/ash/test/ash_test_helper.cc
@@ -5,8 +5,6 @@ #include "ash/test/ash_test_helper.h" #include "ash/accelerators/accelerator_controller_delegate_aura.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/mus/screen_mus.h" #include "ash/mus/window_manager.h" #include "ash/mus/window_manager_application.h" @@ -21,6 +19,8 @@ #include "ash/test/test_shell_delegate.h" #include "ash/test/test_system_tray_delegate.h" #include "ash/test/wm_shell_test_api.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/string_split.h"
diff --git a/ash/test/ash_test_impl_aura.cc b/ash/test/ash_test_impl_aura.cc index 4508c531..33357a4 100644 --- a/ash/test/ash_test_impl_aura.cc +++ b/ash/test/ash_test_impl_aura.cc
@@ -4,11 +4,11 @@ #include "ash/test/ash_test_impl_aura.h" -#include "ash/common/wm_window.h" #include "ash/screen_util.h" #include "ash/shell.h" #include "ash/test/ash_test.h" #include "ash/test/ash_test_base.h" +#include "ash/wm_window.h" #include "base/memory/ptr_util.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/display/display_layout.h"
diff --git a/ash/test/shell_test_api.cc b/ash/test/shell_test_api.cc index 8c8293c..1bec670 100644 --- a/ash/test/shell_test_api.cc +++ b/ash/test/shell_test_api.cc
@@ -4,9 +4,9 @@ #include "ash/test/shell_test_api.h" -#include "ash/common/session/session_state_delegate.h" #include "ash/display/display_configuration_controller.h" #include "ash/root_window_controller.h" +#include "ash/session/session_state_delegate.h" #include "ash/shell.h" namespace ash {
diff --git a/ash/test/status_area_widget_test_helper.cc b/ash/test/status_area_widget_test_helper.cc index cb76a06..39c4e45 100644 --- a/ash/test/status_area_widget_test_helper.cc +++ b/ash/test/status_area_widget_test_helper.cc
@@ -4,11 +4,11 @@ #include "ash/test/status_area_widget_test_helper.h" -#include "ash/common/wm_shell.h" #include "ash/root_window_controller.h" #include "ash/shell.h" #include "ash/system/status_area_widget.h" #include "ash/system/tray/system_tray_delegate.h" +#include "ash/wm_shell.h" namespace ash {
diff --git a/ash/test/test_palette_delegate.h b/ash/test/test_palette_delegate.h index e70e09d..a572eb3 100644 --- a/ash/test/test_palette_delegate.h +++ b/ash/test/test_palette_delegate.h
@@ -5,7 +5,7 @@ #ifndef ASH_TEST_TEST_PALETTE_DELEGATE_H_ #define ASH_TEST_TEST_PALETTE_DELEGATE_H_ -#include "ash/common/palette_delegate.h" +#include "ash/palette_delegate.h" #include "base/macros.h" namespace ash {
diff --git a/ash/test/test_session_state_delegate.cc b/ash/test/test_session_state_delegate.cc index 00834bd..f7fbcda9 100644 --- a/ash/test/test_session_state_delegate.cc +++ b/ash/test/test_session_state_delegate.cc
@@ -7,8 +7,8 @@ #include <algorithm> #include <string> -#include "ash/common/login_status.h" -#include "ash/common/wm_shell.h" +#include "ash/login_status.h" +#include "ash/wm_shell.h" #include "base/memory/ptr_util.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h"
diff --git a/ash/test/test_session_state_delegate.h b/ash/test/test_session_state_delegate.h index 35fe677..c316581 100644 --- a/ash/test/test_session_state_delegate.h +++ b/ash/test/test_session_state_delegate.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "ash/common/session/session_state_delegate.h" +#include "ash/session/session_state_delegate.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "ui/gfx/image/image_skia.h"
diff --git a/ash/test/test_shelf_delegate.cc b/ash/test/test_shelf_delegate.cc index 1fbdd16e..df1a95a 100644 --- a/ash/test/test_shelf_delegate.cc +++ b/ash/test/test_shelf_delegate.cc
@@ -6,14 +6,14 @@ #include <utility> -#include "ash/common/shell_observer.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/root_window_controller.h" #include "ash/shelf/shelf_model.h" #include "ash/shelf/wm_shelf.h" +#include "ash/shell_observer.h" #include "ash/test/test_shelf_item_delegate.h" #include "ash/wm/window_properties.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/memory/ptr_util.h" #include "ui/aura/window.h"
diff --git a/ash/test/test_shelf_item_delegate.cc b/ash/test/test_shelf_item_delegate.cc index d70d384..3459d4f4 100644 --- a/ash/test/test_shelf_item_delegate.cc +++ b/ash/test/test_shelf_item_delegate.cc
@@ -4,8 +4,8 @@ #include "ash/test/test_shelf_item_delegate.h" -#include "ash/common/wm_window.h" #include "ash/wm/window_util.h" +#include "ash/wm_window.h" namespace ash { namespace test {
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc index d1e753f..442e9e75 100644 --- a/ash/test/test_shell_delegate.cc +++ b/ash/test/test_shell_delegate.cc
@@ -6,12 +6,11 @@ #include <limits> -#include "ash/common/default_accessibility_delegate.h" -#include "ash/common/gpu_support_stub.h" -#include "ash/common/palette_delegate.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/default_accessibility_delegate.h" +#include "ash/gpu_support_stub.h" +#include "ash/palette_delegate.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/session/session_state_delegate.h" #include "ash/system/tray/system_tray_notifier.h" #include "ash/test/test_keyboard_ui.h" #include "ash/test/test_session_state_delegate.h" @@ -20,6 +19,7 @@ #include "ash/test/test_wallpaper_delegate.h" #include "ash/wm/window_state.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "ui/aura/window.h"
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h index 5d8bea3..296ea3fc 100644 --- a/ash/test/test_shell_delegate.h +++ b/ash/test/test_shell_delegate.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "ash/common/shell_delegate.h" +#include "ash/shell_delegate.h" #include "ash/test/test_session_state_delegate.h" #include "base/macros.h"
diff --git a/ash/test/test_system_tray_delegate.cc b/ash/test/test_system_tray_delegate.cc index 524058b0e..ec6659a0 100644 --- a/ash/test/test_system_tray_delegate.cc +++ b/ash/test/test_system_tray_delegate.cc
@@ -6,9 +6,9 @@ #include <string> -#include "ash/common/login_status.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/login_status.h" +#include "ash/session/session_state_delegate.h" +#include "ash/wm_shell.h" #include "base/time/time.h" namespace ash {
diff --git a/ash/test/test_wallpaper_delegate.cc b/ash/test/test_wallpaper_delegate.cc index 16279be1..7333bdf 100644 --- a/ash/test/test_wallpaper_delegate.cc +++ b/ash/test/test_wallpaper_delegate.cc
@@ -4,8 +4,8 @@ #include "ash/test/test_wallpaper_delegate.h" -#include "ash/common/wallpaper/wallpaper_controller.h" -#include "ash/common/wm_shell.h" +#include "ash/wallpaper/wallpaper_controller.h" +#include "ash/wm_shell.h" namespace ash { namespace test {
diff --git a/ash/test/tray_cast_test_api.cc b/ash/test/tray_cast_test_api.cc index af9146c8..1ea5c974 100644 --- a/ash/test/tray_cast_test_api.cc +++ b/ash/test/tray_cast_test_api.cc
@@ -4,9 +4,9 @@ #include "ash/test/tray_cast_test_api.h" -#include "ash/common/wm_shell.h" #include "ash/system/tray/system_tray.h" #include "ash/system/tray/system_tray_delegate.h" +#include "ash/wm_shell.h" #include "ui/views/view.h" namespace ash {
diff --git a/ash/test/ui_controls_factory_ash.cc b/ash/test/ui_controls_factory_ash.cc index 090059ec..11ad807f 100644 --- a/ash/test/ui_controls_factory_ash.cc +++ b/ash/test/ui_controls_factory_ash.cc
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm_window.h" #include "ash/shell.h" #include "ash/wm/root_window_finder.h" #include "ash/wm/window_properties.h" +#include "ash/wm_window.h" #include "ui/aura/client/capture_client.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/env.h"
diff --git a/ash/test/wm_shell_test_api.cc b/ash/test/wm_shell_test_api.cc index 35f4b1e..a4c52439 100644 --- a/ash/test/wm_shell_test_api.cc +++ b/ash/test/wm_shell_test_api.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "ash/common/wm_shell.h" #include "ash/public/interfaces/new_window.mojom.h" #include "ash/system/tray/system_tray_delegate.h" +#include "ash/wm_shell.h" namespace ash {
diff --git a/ash/test/wm_window_test_api.h b/ash/test/wm_window_test_api.h index 33bd1a18..4fabeb76 100644 --- a/ash/test/wm_window_test_api.h +++ b/ash/test/wm_window_test_api.h
@@ -5,7 +5,7 @@ #ifndef ASH_TEST_WM_WINDOW_TEST_API_H_ #define ASH_TEST_WM_WINDOW_TEST_API_H_ -#include "ash/common/wm_window.h" +#include "ash/wm_window.h" namespace ash {
diff --git a/ash/tooltips/tooltip_controller_unittest.cc b/ash/tooltips/tooltip_controller_unittest.cc index f73dc6e..263956b 100644 --- a/ash/tooltips/tooltip_controller_unittest.cc +++ b/ash/tooltips/tooltip_controller_unittest.cc
@@ -4,9 +4,9 @@ #include "ui/views/corewm/tooltip_controller.h" -#include "ash/common/wm_shell.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" +#include "ash/wm_shell.h" #include "base/strings/utf_string_conversions.h" #include "ui/aura/env.h" #include "ui/aura/window.h"
diff --git a/ash/touch/touch_observer_hud_unittest.cc b/ash/touch/touch_observer_hud_unittest.cc index b7f7235d..951d40e 100644 --- a/ash/touch/touch_observer_hud_unittest.cc +++ b/ash/touch/touch_observer_hud_unittest.cc
@@ -4,7 +4,7 @@ #include "ash/touch/touch_observer_hud.h" -#include "ash/common/ash_switches.h" +#include "ash/ash_switches.h" #include "ash/root_window_controller.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h"
diff --git a/ash/touch/touch_uma.cc b/ash/touch/touch_uma.cc index c3f66dac..fc6a0d2 100644 --- a/ash/touch/touch_uma.cc +++ b/ash/touch/touch_uma.cc
@@ -4,7 +4,7 @@ #include "ash/touch/touch_uma.h" -#include "ash/common/wm_shell.h" +#include "ash/wm_shell.h" #include "base/metrics/histogram_macros.h" #include "base/strings/stringprintf.h" #include "ui/aura/env.h"
diff --git a/ash/utility/screenshot_controller.h b/ash/utility/screenshot_controller.h index 25854a1..1aa0c7d 100644 --- a/ash/utility/screenshot_controller.h +++ b/ash/utility/screenshot_controller.h
@@ -11,7 +11,7 @@ #include <memory> #include "ash/ash_export.h" -#include "ash/common/shell_observer.h" +#include "ash/shell_observer.h" #include "base/callback.h" #include "base/macros.h" #include "ui/aura/window_observer.h"
diff --git a/ash/virtual_keyboard_controller.cc b/ash/virtual_keyboard_controller.cc index d19ad09..c9bb219 100644 --- a/ash/virtual_keyboard_controller.cc +++ b/ash/virtual_keyboard_controller.cc
@@ -6,13 +6,13 @@ #include <vector> -#include "ash/common/keyboard/keyboard_ui.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/keyboard/keyboard_ui.h" #include "ash/root_window_controller.h" #include "ash/shell.h" #include "ash/system/tray/system_tray_notifier.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "base/strings/string_util.h" #include "ui/display/display.h"
diff --git a/ash/virtual_keyboard_controller.h b/ash/virtual_keyboard_controller.h index d590f19..20c6e02 100644 --- a/ash/virtual_keyboard_controller.h +++ b/ash/virtual_keyboard_controller.h
@@ -8,7 +8,7 @@ #include <stdint.h> #include "ash/ash_export.h" -#include "ash/common/shell_observer.h" +#include "ash/shell_observer.h" #include "base/macros.h" #include "ui/events/devices/input_device_event_observer.h" #include "ui/keyboard/keyboard_layout_delegate.h"
diff --git a/ash/virtual_keyboard_controller_unittest.cc b/ash/virtual_keyboard_controller_unittest.cc index 7cf0a9fe..4a08bb6 100644 --- a/ash/virtual_keyboard_controller_unittest.cc +++ b/ash/virtual_keyboard_controller_unittest.cc
@@ -7,13 +7,13 @@ #include <utility> #include <vector> -#include "ash/common/wm_shell.h" #include "ash/shell.h" #include "ash/system/tray/system_tray_notifier.h" #include "ash/system/virtual_keyboard/virtual_keyboard_observer.h" #include "ash/test/ash_test_base.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h" +#include "ash/wm_shell.h" #include "base/command_line.h" #include "ui/events/devices/device_data_manager.h" #include "ui/events/devices/device_hotplug_event_observer.h"
diff --git a/ash/common/wallpaper/DEPS b/ash/wallpaper/DEPS similarity index 100% rename from ash/common/wallpaper/DEPS rename to ash/wallpaper/DEPS
diff --git a/ash/common/wallpaper/OWNERS b/ash/wallpaper/OWNERS similarity index 100% rename from ash/common/wallpaper/OWNERS rename to ash/wallpaper/OWNERS
diff --git a/ash/common/wallpaper/wallpaper_controller.cc b/ash/wallpaper/wallpaper_controller.cc similarity index 96% rename from ash/common/wallpaper/wallpaper_controller.cc rename to ash/wallpaper/wallpaper_controller.cc index 42e70a7..6d6449d 100644 --- a/ash/common/wallpaper/wallpaper_controller.cc +++ b/ash/wallpaper/wallpaper_controller.cc
@@ -2,20 +2,20 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wallpaper/wallpaper_controller.h" +#include "ash/wallpaper/wallpaper_controller.h" #include <string> #include <utility> -#include "ash/common/ash_switches.h" -#include "ash/common/wallpaper/wallpaper_controller_observer.h" -#include "ash/common/wallpaper/wallpaper_delegate.h" -#include "ash/common/wallpaper/wallpaper_view.h" -#include "ash/common/wallpaper/wallpaper_widget_controller.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/ash_switches.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/wallpaper/wallpaper_controller_observer.h" +#include "ash/wallpaper/wallpaper_delegate.h" +#include "ash/wallpaper/wallpaper_view.h" +#include "ash/wallpaper/wallpaper_widget_controller.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/bind.h" #include "base/command_line.h" #include "base/logging.h"
diff --git a/ash/common/wallpaper/wallpaper_controller.h b/ash/wallpaper/wallpaper_controller.h similarity index 96% rename from ash/common/wallpaper/wallpaper_controller.h rename to ash/wallpaper/wallpaper_controller.h index 0cead11..aaa3010f 100644 --- a/ash/common/wallpaper/wallpaper_controller.h +++ b/ash/wallpaper/wallpaper_controller.h
@@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WALLPAPER_WALLPAPER_CONTROLLER_H_ -#define ASH_COMMON_WALLPAPER_WALLPAPER_CONTROLLER_H_ +#ifndef ASH_WALLPAPER_WALLPAPER_CONTROLLER_H_ +#define ASH_WALLPAPER_WALLPAPER_CONTROLLER_H_ #include <memory> #include "ash/ash_export.h" -#include "ash/common/shell_observer.h" -#include "ash/common/wm_display_observer.h" #include "ash/public/interfaces/wallpaper.mojom.h" +#include "ash/shell_observer.h" +#include "ash/wm_display_observer.h" #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "base/observer_list.h" @@ -186,4 +186,4 @@ } // namespace ash -#endif // ASH_COMMON_WALLPAPER_WALLPAPER_CONTROLLER_H_ +#endif // ASH_WALLPAPER_WALLPAPER_CONTROLLER_H_
diff --git a/ash/common/wallpaper/wallpaper_controller_observer.h b/ash/wallpaper/wallpaper_controller_observer.h similarity index 78% rename from ash/common/wallpaper/wallpaper_controller_observer.h rename to ash/wallpaper/wallpaper_controller_observer.h index 775c802..ed5476c 100644 --- a/ash/common/wallpaper/wallpaper_controller_observer.h +++ b/ash/wallpaper/wallpaper_controller_observer.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WALLPAPER_WALLPAPER_CONTROLLER_OBSERVER_H_ -#define ASH_COMMON_WALLPAPER_WALLPAPER_CONTROLLER_OBSERVER_H_ +#ifndef ASH_WALLPAPER_WALLPAPER_CONTROLLER_OBSERVER_H_ +#define ASH_WALLPAPER_WALLPAPER_CONTROLLER_OBSERVER_H_ #include "ash/ash_export.h" @@ -25,4 +25,4 @@ } // namespace ash -#endif // ASH_COMMON_WALLPAPER_WALLPAPER_CONTROLLER_OBSERVER_H_ +#endif // ASH_WALLPAPER_WALLPAPER_CONTROLLER_OBSERVER_H_
diff --git a/ash/common/wallpaper/wallpaper_controller_unittest.cc b/ash/wallpaper/wallpaper_controller_unittest.cc similarity index 98% rename from ash/common/wallpaper/wallpaper_controller_unittest.cc rename to ash/wallpaper/wallpaper_controller_unittest.cc index d7aac9f..6ac8d1c 100644 --- a/ash/common/wallpaper/wallpaper_controller_unittest.cc +++ b/ash/wallpaper/wallpaper_controller_unittest.cc
@@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wallpaper/wallpaper_controller.h" +#include "ash/wallpaper/wallpaper_controller.h" #include <cmath> #include <cstdlib> -#include "ash/common/wallpaper/wallpaper_view.h" -#include "ash/common/wallpaper/wallpaper_widget_controller.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/test/ash_test_base.h" #include "ash/test/test_wallpaper_delegate.h" +#include "ash/wallpaper/wallpaper_view.h" +#include "ash/wallpaper/wallpaper_widget_controller.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/ash/common/wallpaper/wallpaper_delegate.h b/ash/wallpaper/wallpaper_delegate.h similarity index 92% rename from ash/common/wallpaper/wallpaper_delegate.h rename to ash/wallpaper/wallpaper_delegate.h index 4f435746..0ec8ac84 100644 --- a/ash/common/wallpaper/wallpaper_delegate.h +++ b/ash/wallpaper/wallpaper_delegate.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WALLPAPER_WALLPAPER_DELEGATE_H_ -#define ASH_COMMON_WALLPAPER_WALLPAPER_DELEGATE_H_ +#ifndef ASH_WALLPAPER_WALLPAPER_DELEGATE_H_ +#define ASH_WALLPAPER_WALLPAPER_DELEGATE_H_ #include "ash/ash_export.h" @@ -53,4 +53,4 @@ } // namespace ash -#endif // ASH_COMMON_WALLPAPER_WALLPAPER_DELEGATE_H_ +#endif // ASH_WALLPAPER_WALLPAPER_DELEGATE_H_
diff --git a/ash/common/wallpaper/wallpaper_view.cc b/ash/wallpaper/wallpaper_view.cc similarity index 96% rename from ash/common/wallpaper/wallpaper_view.cc rename to ash/wallpaper/wallpaper_view.cc index f3ad6ae3..3d9127d9 100644 --- a/ash/common/wallpaper/wallpaper_view.cc +++ b/ash/wallpaper/wallpaper_view.cc
@@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wallpaper/wallpaper_view.h" +#include "ash/wallpaper/wallpaper_view.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wallpaper/wallpaper_controller.h" -#include "ash/common/wallpaper/wallpaper_delegate.h" -#include "ash/common/wallpaper/wallpaper_widget_controller.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/root_window_controller.h" +#include "ash/session/session_state_delegate.h" +#include "ash/wallpaper/wallpaper_controller.h" +#include "ash/wallpaper/wallpaper_delegate.h" +#include "ash/wallpaper/wallpaper_widget_controller.h" #include "ash/wm/overview/window_selector_controller.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/display/display.h" #include "ui/display/manager/managed_display_info.h" #include "ui/display/screen.h"
diff --git a/ash/common/wallpaper/wallpaper_view.h b/ash/wallpaper/wallpaper_view.h similarity index 88% rename from ash/common/wallpaper/wallpaper_view.h rename to ash/wallpaper/wallpaper_view.h index 1377057d..ec9baf1 100644 --- a/ash/common/wallpaper/wallpaper_view.h +++ b/ash/wallpaper/wallpaper_view.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WALLPAPER_WALLPAPER_VIEW_H_ -#define ASH_COMMON_WALLPAPER_WALLPAPER_VIEW_H_ +#ifndef ASH_WALLPAPER_WALLPAPER_VIEW_H_ +#define ASH_WALLPAPER_WALLPAPER_VIEW_H_ #include <memory> @@ -40,4 +40,4 @@ } // namespace ash -#endif // ASH_COMMON_WALLPAPER_WALLPAPER_VIEW_H_ +#endif // ASH_WALLPAPER_WALLPAPER_VIEW_H_
diff --git a/ash/common/wallpaper/wallpaper_widget_controller.cc b/ash/wallpaper/wallpaper_widget_controller.cc similarity index 95% rename from ash/common/wallpaper/wallpaper_widget_controller.cc rename to ash/wallpaper/wallpaper_widget_controller.cc index 506cea9..aaedfec 100644 --- a/ash/common/wallpaper/wallpaper_widget_controller.cc +++ b/ash/wallpaper/wallpaper_widget_controller.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wallpaper/wallpaper_widget_controller.h" +#include "ash/wallpaper/wallpaper_widget_controller.h" #include "ash/ash_export.h" -#include "ash/common/wallpaper/wallpaper_delegate.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/root_window_controller.h" +#include "ash/wallpaper/wallpaper_delegate.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/compositor/layer_animation_observer.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/views/widget/widget.h"
diff --git a/ash/common/wallpaper/wallpaper_widget_controller.h b/ash/wallpaper/wallpaper_widget_controller.h similarity index 95% rename from ash/common/wallpaper/wallpaper_widget_controller.h rename to ash/wallpaper/wallpaper_widget_controller.h index f0c3378..a1a61a30 100644 --- a/ash/common/wallpaper/wallpaper_widget_controller.h +++ b/ash/wallpaper/wallpaper_widget_controller.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WALLPAPER_WALLPAPER_WIDGET_CONTROLLER_H_ -#define ASH_COMMON_WALLPAPER_WALLPAPER_WIDGET_CONTROLLER_H_ +#ifndef ASH_WALLPAPER_WALLPAPER_WIDGET_CONTROLLER_H_ +#define ASH_WALLPAPER_WALLPAPER_WIDGET_CONTROLLER_H_ #include <memory> @@ -98,4 +98,4 @@ } // namespace ash -#endif // ASH_COMMON_WALLPAPER_WALLPAPER_WIDGET_CONTROLLER_H_ +#endif // ASH_WALLPAPER_WALLPAPER_WIDGET_CONTROLLER_H_
diff --git a/ash/wm/always_on_top_controller.cc b/ash/wm/always_on_top_controller.cc index 90ee7a1..de8b48c 100644 --- a/ash/wm/always_on_top_controller.cc +++ b/ash/wm/always_on_top_controller.cc
@@ -4,9 +4,9 @@ #include "ash/wm/always_on_top_controller.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/wm/workspace/workspace_layout_manager.h" +#include "ash/wm_window.h" #include "base/memory/ptr_util.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h"
diff --git a/ash/wm/always_on_top_controller_unittest.cc b/ash/wm/always_on_top_controller_unittest.cc index 70131d69..bd5267db 100644 --- a/ash/wm/always_on_top_controller_unittest.cc +++ b/ash/wm/always_on_top_controller_unittest.cc
@@ -4,12 +4,12 @@ #include "ash/wm/always_on_top_controller.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/wm/workspace/workspace_layout_manager.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "base/memory/ptr_util.h" #include "ui/keyboard/keyboard_controller.h"
diff --git a/ash/wm/ash_focus_rules.cc b/ash/wm/ash_focus_rules.cc index 2d4616a..80e16cf 100644 --- a/ash/wm/ash_focus_rules.cc +++ b/ash/wm/ash_focus_rules.cc
@@ -4,8 +4,6 @@ #include "ash/wm/ash_focus_rules.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" #include "ash/wm/container_finder.h" @@ -13,6 +11,8 @@ #include "ash/wm/mru_window_tracker.h" #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/aura/window.h" namespace ash {
diff --git a/ash/wm/ash_focus_rules_unittest.cc b/ash/wm/ash_focus_rules_unittest.cc index 2ea7da9..a483d44 100644 --- a/ash/wm/ash_focus_rules_unittest.cc +++ b/ash/wm/ash_focus_rules_unittest.cc
@@ -2,9 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/session/session_state_delegate.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/ash_test_helper.h" @@ -14,6 +13,7 @@ #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" #include "services/ui/public/interfaces/window_manager_constants.mojom.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/window_parenting_client.h"
diff --git a/ash/wm/container_finder.cc b/ash/wm/container_finder.cc index 0efd32d..9d88311a 100644 --- a/ash/wm/container_finder.cc +++ b/ash/wm/container_finder.cc
@@ -4,15 +4,15 @@ #include "ash/wm/container_finder.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/public/cpp/window_properties.h" #include "ash/root_window_controller.h" +#include "ash/session/session_state_delegate.h" #include "ash/wm/always_on_top_controller.h" #include "ash/wm/root_window_finder.h" #include "ash/wm/window_state.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/gfx/geometry/rect.h" namespace ash {
diff --git a/ash/wm/container_finder_unittest.cc b/ash/wm/container_finder_unittest.cc index 7692c82..459ac7d 100644 --- a/ash/wm/container_finder_unittest.cc +++ b/ash/wm/container_finder_unittest.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/test/ash_test.h" +#include "ash/wm_window.h" #include "ui/gfx/geometry/rect.h" #include "ui/views/widget/widget.h"
diff --git a/ash/wm/default_state.cc b/ash/wm/default_state.cc index 404786e..822a9fa 100644 --- a/ash/wm/default_state.cc +++ b/ash/wm/default_state.cc
@@ -4,9 +4,7 @@ #include "ash/wm/default_state.h" -#include "ash/common/ash_switches.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/ash_switches.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/wm/dock/docked_window_layout_manager.h" @@ -18,6 +16,8 @@ #include "ash/wm/window_state_util.h" #include "ash/wm/wm_event.h" #include "ash/wm/wm_screen_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/display/display.h" #include "ui/display/screen.h"
diff --git a/ash/wm/default_window_resizer.cc b/ash/wm/default_window_resizer.cc index 98943add..874b0dd 100644 --- a/ash/wm/default_window_resizer.cc +++ b/ash/wm/default_window_resizer.cc
@@ -4,9 +4,9 @@ #include "ash/wm/default_window_resizer.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/wm/window_state.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" namespace ash {
diff --git a/ash/wm/dock/docked_window_layout_manager.cc b/ash/wm/dock/docked_window_layout_manager.cc index 86ddad13..60089f2e 100644 --- a/ash/wm/dock/docked_window_layout_manager.cc +++ b/ash/wm/dock/docked_window_layout_manager.cc
@@ -5,8 +5,6 @@ #include "ash/wm/dock/docked_window_layout_manager.h" #include "ash/animation/animation_change_type.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/resources/grit/ash_resources.h" #include "ash/root_window_controller.h" @@ -21,6 +19,8 @@ #include "ash/wm/window_resizer.h" #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/auto_reset.h" #include "base/metrics/histogram_macros.h" #include "third_party/skia/include/core/SkColor.h"
diff --git a/ash/wm/dock/docked_window_layout_manager.h b/ash/wm/dock/docked_window_layout_manager.h index 956a21c..58e4703 100644 --- a/ash/wm/dock/docked_window_layout_manager.h +++ b/ash/wm/dock/docked_window_layout_manager.h
@@ -8,12 +8,12 @@ #include <memory> #include "ash/ash_export.h" -#include "ash/common/shell_observer.h" -#include "ash/common/wm_activation_observer.h" +#include "ash/shell_observer.h" #include "ash/wm/dock/dock_types.h" #include "ash/wm/dock/docked_window_layout_manager_observer.h" #include "ash/wm/window_state_observer.h" #include "ash/wm/wm_snap_to_pixel_layout_manager.h" +#include "ash/wm_activation_observer.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "base/observer_list.h"
diff --git a/ash/wm/dock/docked_window_layout_manager_unittest.cc b/ash/wm/dock/docked_window_layout_manager_unittest.cc index 9e4b3f7..84133b5 100644 --- a/ash/wm/dock/docked_window_layout_manager_unittest.cc +++ b/ash/wm/dock/docked_window_layout_manager_unittest.cc
@@ -4,9 +4,7 @@ #include "ash/wm/dock/docked_window_layout_manager.h" -#include "ash/common/ash_switches.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/ash_switches.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/shelf/wm_shelf.h" @@ -20,6 +18,8 @@ #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "base/strings/string_number_conversions.h" #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
diff --git a/ash/wm/dock/docked_window_resizer.cc b/ash/wm/dock/docked_window_resizer.cc index 68f4da5..28e1c1a 100644 --- a/ash/wm/dock/docked_window_resizer.cc +++ b/ash/wm/dock/docked_window_resizer.cc
@@ -4,7 +4,6 @@ #include "ash/wm/dock/docked_window_resizer.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/public/cpp/window_properties.h" #include "ash/root_window_controller.h" @@ -14,6 +13,7 @@ #include "ash/wm/window_state.h" #include "ash/wm/wm_event.h" #include "ash/wm/workspace/magnetism_matcher.h" +#include "ash/wm_window.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" #include "ui/display/display.h"
diff --git a/ash/wm/dock/docked_window_resizer_unittest.cc b/ash/wm/dock/docked_window_resizer_unittest.cc index 4e607de..e3a2b6b1 100644 --- a/ash/wm/dock/docked_window_resizer_unittest.cc +++ b/ash/wm/dock/docked_window_resizer_unittest.cc
@@ -4,9 +4,7 @@ #include "ash/wm/dock/docked_window_resizer.h" -#include "ash/common/ash_switches.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/ash_switches.h" #include "ash/display/window_tree_host_manager.h" #include "ash/public/cpp/shelf_types.h" #include "ash/public/cpp/shell_window_ids.h" @@ -26,6 +24,8 @@ #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "ash/wm/wm_event.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/window_parenting_client.h"
diff --git a/ash/wm/drag_details.cc b/ash/wm/drag_details.cc index 97dce25b..cc525f05 100644 --- a/ash/wm/drag_details.cc +++ b/ash/wm/drag_details.cc
@@ -4,9 +4,9 @@ #include "ash/wm/drag_details.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/window_properties.h" #include "ash/wm/window_resizer.h" +#include "ash/wm_window.h" #include "ui/aura/window.h" #include "ui/base/hit_test.h" #include "ui/compositor/layer.h"
diff --git a/ash/wm/drag_window_resizer.cc b/ash/wm/drag_window_resizer.cc index b792990..760189e8 100644 --- a/ash/wm/drag_window_resizer.cc +++ b/ash/wm/drag_window_resizer.cc
@@ -4,13 +4,13 @@ #include "ash/wm/drag_window_resizer.h" -#include "ash/common/wm_window.h" #include "ash/display/mouse_cursor_event_filter.h" #include "ash/shell.h" #include "ash/wm/drag_window_controller.h" #include "ash/wm/window_positioning_utils.h" #include "ash/wm/window_state.h" #include "ash/wm/window_util.h" +#include "ash/wm_window.h" #include "base/memory/weak_ptr.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/env.h"
diff --git a/ash/wm/drag_window_resizer_unittest.cc b/ash/wm/drag_window_resizer_unittest.cc index 37e71150..7c6e3f5 100644 --- a/ash/wm/drag_window_resizer_unittest.cc +++ b/ash/wm/drag_window_resizer_unittest.cc
@@ -4,7 +4,6 @@ #include "ash/wm/drag_window_resizer.h" -#include "ash/common/wm_window.h" #include "ash/display/mouse_cursor_event_filter.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" @@ -15,6 +14,7 @@ #include "ash/wm/drag_window_controller.h" #include "ash/wm/window_positioning_utils.h" #include "ash/wm/window_util.h" +#include "ash/wm_window.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "ui/aura/client/aura_constants.h"
diff --git a/ash/wm/event_client_impl.cc b/ash/wm/event_client_impl.cc index 1a16deb..58527b9 100644 --- a/ash/wm/event_client_impl.cc +++ b/ash/wm/event_client_impl.cc
@@ -4,10 +4,10 @@ #include "ash/wm/event_client_impl.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/session/session_state_delegate.h" #include "ash/shell.h" +#include "ash/wm_shell.h" #include "ui/aura/window.h" #include "ui/keyboard/keyboard_util.h"
diff --git a/ash/wm/focus_rules.cc b/ash/wm/focus_rules.cc index bfe3df6..087ee570 100644 --- a/ash/wm/focus_rules.cc +++ b/ash/wm/focus_rules.cc
@@ -4,11 +4,11 @@ #include "ash/wm/focus_rules.h" -#include "ash/common/shell_delegate.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/shell_delegate.h" #include "ash/wm/window_state.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" namespace ash {
diff --git a/ash/wm/fullscreen_window_finder.cc b/ash/wm/fullscreen_window_finder.cc index 90704f4..22fe6ddc 100644 --- a/ash/wm/fullscreen_window_finder.cc +++ b/ash/wm/fullscreen_window_finder.cc
@@ -4,11 +4,11 @@ #include "ash/wm/fullscreen_window_finder.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/wm/switchable_windows.h" #include "ash/wm/window_state.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/compositor/layer.h" namespace ash {
diff --git a/ash/wm/gestures/overview_gesture_handler.cc b/ash/wm/gestures/overview_gesture_handler.cc index aee408c..31adf1c 100644 --- a/ash/wm/gestures/overview_gesture_handler.cc +++ b/ash/wm/gestures/overview_gesture_handler.cc
@@ -4,8 +4,8 @@ #include "ash/wm/gestures/overview_gesture_handler.h" -#include "ash/common/wm_shell.h" #include "ash/wm/overview/window_selector_controller.h" +#include "ash/wm_shell.h" #include "ui/events/event.h" #include "ui/events/event_constants.h"
diff --git a/ash/wm/gestures/overview_gesture_handler_unittest.cc b/ash/wm/gestures/overview_gesture_handler_unittest.cc index ec5ee028..d92bd16f 100644 --- a/ash/wm/gestures/overview_gesture_handler_unittest.cc +++ b/ash/wm/gestures/overview_gesture_handler_unittest.cc
@@ -4,12 +4,12 @@ #include "ash/wm/gestures/overview_gesture_handler.h" -#include "ash/common/wm_shell.h" #include "ash/root_window_controller.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/wm/overview/window_selector_controller.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h"
diff --git a/ash/wm/immersive_context_ash.cc b/ash/wm/immersive_context_ash.cc index 2cfabb4b..eb53112a 100644 --- a/ash/wm/immersive_context_ash.cc +++ b/ash/wm/immersive_context_ash.cc
@@ -4,11 +4,11 @@ #include "ash/wm/immersive_context_ash.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/shared/immersive_fullscreen_controller.h" #include "ash/shelf/wm_shelf.h" #include "ash/wm/window_state.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/logging.h" #include "ui/display/display.h" #include "ui/display/screen.h"
diff --git a/ash/wm/immersive_fullscreen_controller_unittest.cc b/ash/wm/immersive_fullscreen_controller_unittest.cc index db136aa..5cad8f1 100644 --- a/ash/wm/immersive_fullscreen_controller_unittest.cc +++ b/ash/wm/immersive_fullscreen_controller_unittest.cc
@@ -4,7 +4,6 @@ #include "ash/shared/immersive_fullscreen_controller.h" -#include "ash/common/wm_shell.h" #include "ash/display/mouse_cursor_event_filter.h" #include "ash/public/cpp/shelf_types.h" #include "ash/root_window_controller.h" @@ -15,6 +14,7 @@ #include "ash/test/immersive_fullscreen_controller_test_api.h" #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm_shell.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/cursor_client.h" #include "ui/aura/env.h"
diff --git a/ash/wm/lock_layout_manager.cc b/ash/wm/lock_layout_manager.cc index d6b7766..3c9de39 100644 --- a/ash/wm/lock_layout_manager.cc +++ b/ash/wm/lock_layout_manager.cc
@@ -4,11 +4,11 @@ #include "ash/wm/lock_layout_manager.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/wm/lock_window_state.h" #include "ash/wm/window_state.h" #include "ash/wm/wm_event.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/events/event.h" #include "ui/keyboard/keyboard_controller.h" #include "ui/keyboard/keyboard_util.h"
diff --git a/ash/wm/lock_layout_manager.h b/ash/wm/lock_layout_manager.h index dc08d23d..d3e30ab 100644 --- a/ash/wm/lock_layout_manager.h +++ b/ash/wm/lock_layout_manager.h
@@ -6,7 +6,7 @@ #define ASH_WM_LOCK_LAYOUT_MANAGER_H_ #include "ash/ash_export.h" -#include "ash/common/shell_observer.h" +#include "ash/shell_observer.h" #include "ash/wm/wm_snap_to_pixel_layout_manager.h" #include "ash/wm/wm_types.h" #include "base/macros.h"
diff --git a/ash/wm/lock_state_controller.cc b/ash/wm/lock_state_controller.cc index 293d95a..c71db5b 100644 --- a/ash/wm/lock_state_controller.cc +++ b/ash/wm/lock_state_controller.cc
@@ -8,16 +8,16 @@ #include <string> #include <utility> +#include "ash/accessibility_delegate.h" #include "ash/cancel_mode.h" -#include "ash/common/accessibility_delegate.h" -#include "ash/common/shell_delegate.h" -#include "ash/common/shutdown_controller.h" -#include "ash/common/wm_shell.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/public/interfaces/shutdown.mojom.h" #include "ash/shell.h" +#include "ash/shell_delegate.h" +#include "ash/shutdown_controller.h" #include "ash/wm/session_state_animator.h" #include "ash/wm/session_state_animator_impl.h" +#include "ash/wm_shell.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h"
diff --git a/ash/wm/lock_state_controller.h b/ash/wm/lock_state_controller.h index 00b49e81..3ba1ccac 100644 --- a/ash/wm/lock_state_controller.h +++ b/ash/wm/lock_state_controller.h
@@ -8,7 +8,7 @@ #include <memory> #include "ash/ash_export.h" -#include "ash/common/shell_observer.h" +#include "ash/shell_observer.h" #include "ash/wm/session_state_animator.h" #include "base/macros.h" #include "base/memory/weak_ptr.h"
diff --git a/ash/wm/lock_state_controller_unittest.cc b/ash/wm/lock_state_controller_unittest.cc index 981fa83..64896c8 100644 --- a/ash/wm/lock_state_controller_unittest.cc +++ b/ash/wm/lock_state_controller_unittest.cc
@@ -7,10 +7,9 @@ #include <memory> #include <utility> -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/shutdown_controller.h" -#include "ash/common/wm_shell.h" +#include "ash/session/session_state_delegate.h" #include "ash/shell.h" +#include "ash/shutdown_controller.h" #include "ash/test/ash_test_base.h" #include "ash/test/lock_state_controller_test_api.h" #include "ash/test/test_screenshot_delegate.h" @@ -20,6 +19,7 @@ #include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "ash/wm/power_button_controller.h" #include "ash/wm/session_state_animator.h" +#include "ash/wm_shell.h" #include "base/memory/ptr_util.h" #include "base/memory/scoped_vector.h" #include "base/time/time.h"
diff --git a/ash/wm/lock_window_state.cc b/ash/wm/lock_window_state.cc index 7b36315..04931a9 100644 --- a/ash/wm/lock_window_state.cc +++ b/ash/wm/lock_window_state.cc
@@ -6,8 +6,6 @@ #include <utility> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/wm/lock_layout_manager.h" #include "ash/wm/window_animation_types.h" #include "ash/wm/window_state.h" @@ -15,6 +13,8 @@ #include "ash/wm/window_state_util.h" #include "ash/wm/wm_event.h" #include "ash/wm/wm_screen_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/memory/ptr_util.h" #include "ui/gfx/geometry/rect.h" #include "ui/keyboard/keyboard_controller.h"
diff --git a/ash/wm/maximize_mode/maximize_mode_controller.cc b/ash/wm/maximize_mode/maximize_mode_controller.cc index 7b1d9c2..6df9ffb8 100644 --- a/ash/wm/maximize_mode/maximize_mode_controller.cc +++ b/ash/wm/maximize_mode/maximize_mode_controller.cc
@@ -6,10 +6,10 @@ #include <utility> -#include "ash/common/ash_switches.h" -#include "ash/common/wm_shell.h" +#include "ash/ash_switches.h" #include "ash/wm/maximize_mode/maximize_mode_window_manager.h" #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h" +#include "ash/wm_shell.h" #include "base/command_line.h" #include "base/metrics/histogram_macros.h" #include "base/time/default_tick_clock.h"
diff --git a/ash/wm/maximize_mode/maximize_mode_controller.h b/ash/wm/maximize_mode/maximize_mode_controller.h index 4d9a217f..292910e 100644 --- a/ash/wm/maximize_mode/maximize_mode_controller.h +++ b/ash/wm/maximize_mode/maximize_mode_controller.h
@@ -8,9 +8,9 @@ #include <memory> #include "ash/ash_export.h" -#include "ash/common/shell_observer.h" -#include "ash/common/wm_display_observer.h" #include "ash/public/interfaces/touch_view.mojom.h" +#include "ash/shell_observer.h" +#include "ash/wm_display_observer.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "base/time/time.h"
diff --git a/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc b/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc index 49fafcfbc..ed1da05 100644 --- a/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc +++ b/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
@@ -8,13 +8,13 @@ #include <utility> #include <vector> -#include "ash/common/ash_switches.h" -#include "ash/common/wm_shell.h" +#include "ash/ash_switches.h" #include "ash/shell.h" #include "ash/system/tray/system_tray_delegate.h" #include "ash/test/ash_test_base.h" #include "ash/test/test_system_tray_delegate.h" #include "ash/wm/overview/window_selector_controller.h" +#include "ash/wm_shell.h" #include "base/command_line.h" #include "base/test/simple_test_tick_clock.h" #include "base/test/user_action_tester.h"
diff --git a/ash/wm/maximize_mode/maximize_mode_event_handler.cc b/ash/wm/maximize_mode/maximize_mode_event_handler.cc index cfe077c0..c5dc5f1d 100644 --- a/ash/wm/maximize_mode/maximize_mode_event_handler.cc +++ b/ash/wm/maximize_mode/maximize_mode_event_handler.cc
@@ -4,12 +4,12 @@ #include "ash/wm/maximize_mode/maximize_mode_event_handler.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/session/session_state_delegate.h" #include "ash/system/tray/system_tray_delegate.h" #include "ash/wm/window_state.h" #include "ash/wm/wm_event.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/events/event.h" namespace ash {
diff --git a/ash/wm/maximize_mode/maximize_mode_window_manager.cc b/ash/wm/maximize_mode/maximize_mode_window_manager.cc index 3b92f3c..49fee7c 100644 --- a/ash/wm/maximize_mode/maximize_mode_window_manager.cc +++ b/ash/wm/maximize_mode/maximize_mode_window_manager.cc
@@ -4,12 +4,10 @@ #include "ash/wm/maximize_mode/maximize_mode_window_manager.h" -#include "ash/common/ash_switches.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/ash_switches.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/session/session_state_delegate.h" #include "ash/shell.h" #include "ash/wm/maximize_mode/maximize_mode_event_handler.h" #include "ash/wm/maximize_mode/maximize_mode_window_state.h" @@ -20,6 +18,8 @@ #include "ash/wm/window_state_aura.h" #include "ash/wm/wm_event.h" #include "ash/wm/workspace_controller.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "base/memory/ptr_util.h" #include "base/stl_util.h"
diff --git a/ash/wm/maximize_mode/maximize_mode_window_manager.h b/ash/wm/maximize_mode/maximize_mode_window_manager.h index d1a532a3b..081384cb 100644 --- a/ash/wm/maximize_mode/maximize_mode_window_manager.h +++ b/ash/wm/maximize_mode/maximize_mode_window_manager.h
@@ -11,7 +11,7 @@ #include <unordered_set> #include "ash/ash_export.h" -#include "ash/common/shell_observer.h" +#include "ash/shell_observer.h" #include "ash/wm/window_state.h" #include "base/macros.h" #include "ui/aura/window_observer.h"
diff --git a/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc b/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc index 16cf02e..e49002e 100644 --- a/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc +++ b/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc
@@ -6,9 +6,7 @@ #include <string> -#include "ash/common/ash_switches.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/ash_switches.h" #include "ash/root_window_controller.h" #include "ash/screen_util.h" #include "ash/shelf/wm_shelf.h" @@ -25,6 +23,8 @@ #include "ash/wm/window_state_observer.h" #include "ash/wm/window_util.h" #include "ash/wm/wm_event.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/ash/wm/maximize_mode/maximize_mode_window_state.cc b/ash/wm/maximize_mode/maximize_mode_window_state.cc index 8021bc49..ff26b8a 100644 --- a/ash/wm/maximize_mode/maximize_mode_window_state.cc +++ b/ash/wm/maximize_mode/maximize_mode_window_state.cc
@@ -6,14 +6,14 @@ #include <utility> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/wm/maximize_mode/maximize_mode_window_manager.h" #include "ash/wm/window_animation_types.h" #include "ash/wm/window_state_util.h" #include "ash/wm/wm_event.h" #include "ash/wm/wm_screen_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/compositor/layer.h" #include "ui/gfx/geometry/rect.h"
diff --git a/ash/wm/maximize_mode/workspace_backdrop_delegate.cc b/ash/wm/maximize_mode/workspace_backdrop_delegate.cc index 95c4596..ff6e7f58 100644 --- a/ash/wm/maximize_mode/workspace_backdrop_delegate.cc +++ b/ash/wm/maximize_mode/workspace_backdrop_delegate.cc
@@ -4,10 +4,10 @@ #include "ash/wm/maximize_mode/workspace_backdrop_delegate.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/wm/workspace/workspace_layout_manager_backdrop_delegate.h" +#include "ash/wm_window.h" #include "base/auto_reset.h" #include "ui/aura/window_observer.h" #include "ui/compositor/layer.h"
diff --git a/ash/wm/mru_window_tracker.cc b/ash/wm/mru_window_tracker.cc index c9e59805..0d1e56c 100644 --- a/ash/wm/mru_window_tracker.cc +++ b/ash/wm/mru_window_tracker.cc
@@ -6,12 +6,12 @@ #include <algorithm> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/wm/focus_rules.h" #include "ash/wm/switchable_windows.h" #include "ash/wm/window_state.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/bind.h" #include "ui/aura/window.h"
diff --git a/ash/wm/mru_window_tracker.h b/ash/wm/mru_window_tracker.h index 76ec2db..8063b85b 100644 --- a/ash/wm/mru_window_tracker.h +++ b/ash/wm/mru_window_tracker.h
@@ -9,7 +9,7 @@ #include <vector> #include "ash/ash_export.h" -#include "ash/common/wm_activation_observer.h" +#include "ash/wm_activation_observer.h" #include "base/macros.h" #include "ui/aura/window_observer.h"
diff --git a/ash/wm/mru_window_tracker_unittest.cc b/ash/wm/mru_window_tracker_unittest.cc index 3e83708..94c4b93a 100644 --- a/ash/wm/mru_window_tracker_unittest.cc +++ b/ash/wm/mru_window_tracker_unittest.cc
@@ -4,11 +4,11 @@ #include "ash/wm/mru_window_tracker.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/test/ash_test.h" #include "ash/wm/window_state.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/base/hit_test.h" namespace ash {
diff --git a/ash/wm/overlay_event_filter.h b/ash/wm/overlay_event_filter.h index 0671b7b..218a835 100644 --- a/ash/wm/overlay_event_filter.h +++ b/ash/wm/overlay_event_filter.h
@@ -6,7 +6,7 @@ #define ASH_WM_OVERLAY_EVENT_FILTER_H_ #include "ash/ash_export.h" -#include "ash/common/shell_observer.h" +#include "ash/shell_observer.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "ui/aura/window.h"
diff --git a/ash/wm/overview/cleanup_animation_observer_unittest.cc b/ash/wm/overview/cleanup_animation_observer_unittest.cc index 4a16de6..1cfc762 100644 --- a/ash/wm/overview/cleanup_animation_observer_unittest.cc +++ b/ash/wm/overview/cleanup_animation_observer_unittest.cc
@@ -6,9 +6,9 @@ #include <vector> -#include "ash/common/wm_window.h" #include "ash/test/ash_test_base.h" #include "ash/wm/overview/window_selector_delegate.h" +#include "ash/wm_window.h" #include "ui/compositor/layer_animation_observer.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" #include "ui/compositor/scoped_layer_animation_settings.h"
diff --git a/ash/wm/overview/scoped_overview_animation_settings_factory_aura.cc b/ash/wm/overview/scoped_overview_animation_settings_factory_aura.cc index d439ba06..2feed27 100644 --- a/ash/wm/overview/scoped_overview_animation_settings_factory_aura.cc +++ b/ash/wm/overview/scoped_overview_animation_settings_factory_aura.cc
@@ -4,8 +4,8 @@ #include "ash/wm/overview/scoped_overview_animation_settings_factory_aura.h" -#include "ash/common/wm_window.h" #include "ash/wm/overview/scoped_overview_animation_settings_aura.h" +#include "ash/wm_window.h" #include "base/memory/ptr_util.h" namespace ash {
diff --git a/ash/wm/overview/scoped_transform_overview_window.cc b/ash/wm/overview/scoped_transform_overview_window.cc index 99810eb..bb94bf87 100644 --- a/ash/wm/overview/scoped_transform_overview_window.cc +++ b/ash/wm/overview/scoped_transform_overview_window.cc
@@ -7,13 +7,13 @@ #include <algorithm> #include <vector> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/root_window_controller.h" #include "ash/wm/overview/scoped_overview_animation_settings.h" #include "ash/wm/overview/scoped_overview_animation_settings_factory.h" #include "ash/wm/overview/window_selector_item.h" #include "ash/wm/window_state.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/macros.h" #include "base/memory/ptr_util.h" #include "base/single_thread_task_runner.h"
diff --git a/ash/wm/overview/window_grid.cc b/ash/wm/overview/window_grid.cc index 8b2a68d..e3f04d8 100644 --- a/ash/wm/overview/window_grid.cc +++ b/ash/wm/overview/window_grid.cc
@@ -10,8 +10,7 @@ #include <utility> #include <vector> -#include "ash/common/ash_switches.h" -#include "ash/common/wm_window.h" +#include "ash/ash_switches.h" #include "ash/public/cpp/shelf_types.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" @@ -25,6 +24,7 @@ #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/wm_screen_util.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "base/i18n/string_search.h" #include "base/memory/ptr_util.h"
diff --git a/ash/wm/overview/window_selector.cc b/ash/wm/overview/window_selector.cc index ac05f0a..f6ce60b9 100644 --- a/ash/wm/overview/window_selector.cc +++ b/ash/wm/overview/window_selector.cc
@@ -10,10 +10,8 @@ #include <utility> #include <vector> -#include "ash/common/accessibility_delegate.h" -#include "ash/common/accessibility_types.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/metrics/user_metrics_action.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" @@ -26,6 +24,8 @@ #include "ash/wm/switchable_windows.h" #include "ash/wm/window_state.h" #include "ash/wm/wm_screen_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/auto_reset.h" #include "base/command_line.h" #include "base/metrics/histogram_macros.h"
diff --git a/ash/wm/overview/window_selector.h b/ash/wm/overview/window_selector.h index 31b980f..080732cd 100644 --- a/ash/wm/overview/window_selector.h +++ b/ash/wm/overview/window_selector.h
@@ -13,7 +13,7 @@ #include <vector> #include "ash/ash_export.h" -#include "ash/common/wm_activation_observer.h" +#include "ash/wm_activation_observer.h" #include "base/macros.h" #include "base/time/time.h" #include "ui/aura/window_observer.h"
diff --git a/ash/wm/overview/window_selector_controller.cc b/ash/wm/overview/window_selector_controller.cc index f74771f..bc8fc5d 100644 --- a/ash/wm/overview/window_selector_controller.cc +++ b/ash/wm/overview/window_selector_controller.cc
@@ -6,13 +6,13 @@ #include <vector> -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/session/session_state_delegate.h" #include "ash/system/tray/system_tray_delegate.h" #include "ash/wm/mru_window_tracker.h" #include "ash/wm/overview/window_selector.h" #include "ash/wm/window_state.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/metrics/histogram_macros.h" namespace ash {
diff --git a/ash/wm/overview/window_selector_item.cc b/ash/wm/overview/window_selector_item.cc index 34dd1e5..1e2c0ea 100644 --- a/ash/wm/overview/window_selector_item.cc +++ b/ash/wm/overview/window_selector_item.cc
@@ -7,9 +7,7 @@ #include <algorithm> #include <vector> -#include "ash/common/material_design/material_design_controller.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/material_design/material_design_controller.h" #include "ash/metrics/user_metrics_action.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/resources/vector_icons/vector_icons.h" @@ -23,6 +21,8 @@ #include "ash/wm/overview/window_selector.h" #include "ash/wm/overview/window_selector_controller.h" #include "ash/wm/window_state.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/auto_reset.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc index 682a10d..5e31bf4 100644 --- a/ash/wm/overview/window_selector_unittest.cc +++ b/ash/wm/overview/window_selector_unittest.cc
@@ -5,11 +5,9 @@ #include <algorithm> #include <vector> -#include "ash/common/accessibility_delegate.h" -#include "ash/common/accessibility_types.h" -#include "ash/common/ash_switches.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/ash_switches.h" #include "ash/drag_drop/drag_drop_controller.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" @@ -36,6 +34,8 @@ #include "ash/wm/window_util.h" #include "ash/wm/wm_event.h" #include "ash/wm/workspace/workspace_window_resizer.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/memory/ptr_util.h"
diff --git a/ash/wm/panels/attached_panel_window_targeter.cc b/ash/wm/panels/attached_panel_window_targeter.cc index d7f50a6c..24e1d86 100644 --- a/ash/wm/panels/attached_panel_window_targeter.cc +++ b/ash/wm/panels/attached_panel_window_targeter.cc
@@ -4,10 +4,10 @@ #include "ash/wm/panels/attached_panel_window_targeter.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/shelf/wm_shelf.h" #include "ash/wm/panels/panel_layout_manager.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/aura/window.h" namespace ash {
diff --git a/ash/wm/panels/attached_panel_window_targeter.h b/ash/wm/panels/attached_panel_window_targeter.h index d2d8b81..423e229 100644 --- a/ash/wm/panels/attached_panel_window_targeter.h +++ b/ash/wm/panels/attached_panel_window_targeter.h
@@ -5,7 +5,7 @@ #ifndef ASH_WM_PANELS_ATTACHED_PANEL_WINDOW_TARGETER_H_ #define ASH_WM_PANELS_ATTACHED_PANEL_WINDOW_TARGETER_H_ -#include "ash/common/shell_observer.h" +#include "ash/shell_observer.h" #include "base/macros.h" #include "ui/wm/core/easy_resize_window_targeter.h"
diff --git a/ash/wm/panels/panel_frame_view.cc b/ash/wm/panels/panel_frame_view.cc index 5f7fe58..21908fd1 100644 --- a/ash/wm/panels/panel_frame_view.cc +++ b/ash/wm/panels/panel_frame_view.cc
@@ -4,11 +4,11 @@ #include "ash/wm/panels/panel_frame_view.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" #include "ash/frame/default_header_painter.h" #include "ash/frame/frame_border_hit_test.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" #include "ui/base/hit_test.h"
diff --git a/ash/wm/panels/panel_frame_view.h b/ash/wm/panels/panel_frame_view.h index 37e4af3..ae56e4e9 100644 --- a/ash/wm/panels/panel_frame_view.h +++ b/ash/wm/panels/panel_frame_view.h
@@ -8,7 +8,7 @@ #include <memory> #include "ash/ash_export.h" -#include "ash/common/shell_observer.h" +#include "ash/shell_observer.h" #include "base/macros.h" #include "ui/views/window/non_client_view.h"
diff --git a/ash/wm/panels/panel_layout_manager.cc b/ash/wm/panels/panel_layout_manager.cc index 0ab5e965..a02f047 100644 --- a/ash/wm/panels/panel_layout_manager.cc +++ b/ash/wm/panels/panel_layout_manager.cc
@@ -8,8 +8,6 @@ #include <map> #include <utility> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/public/cpp/window_properties.h" #include "ash/root_window_controller.h" @@ -20,6 +18,8 @@ #include "ash/wm/window_parenting_utils.h" #include "ash/wm/window_properties.h" #include "ash/wm/window_state.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/auto_reset.h" #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkPath.h"
diff --git a/ash/wm/panels/panel_layout_manager.h b/ash/wm/panels/panel_layout_manager.h index 7a435bb..5fe184ac 100644 --- a/ash/wm/panels/panel_layout_manager.h +++ b/ash/wm/panels/panel_layout_manager.h
@@ -9,13 +9,13 @@ #include <memory> #include "ash/ash_export.h" -#include "ash/common/shell_observer.h" -#include "ash/common/wm_activation_observer.h" -#include "ash/common/wm_display_observer.h" -#include "ash/common/wm_layout_manager.h" #include "ash/root_window_controller.h" #include "ash/shelf/wm_shelf_observer.h" +#include "ash/shell_observer.h" #include "ash/wm/window_state_observer.h" +#include "ash/wm_activation_observer.h" +#include "ash/wm_display_observer.h" +#include "ash/wm_layout_manager.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "base/memory/weak_ptr.h"
diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc index f5c66c3..007b6088 100644 --- a/ash/wm/panels/panel_layout_manager_unittest.cc +++ b/ash/wm/panels/panel_layout_manager_unittest.cc
@@ -4,8 +4,6 @@ #include "ash/wm/panels/panel_layout_manager.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shelf_types.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" @@ -25,6 +23,8 @@ #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/i18n/rtl.h"
diff --git a/ash/wm/panels/panel_window_event_handler.cc b/ash/wm/panels/panel_window_event_handler.cc index 7736eac..5ba0a2e 100644 --- a/ash/wm/panels/panel_window_event_handler.cc +++ b/ash/wm/panels/panel_window_event_handler.cc
@@ -4,9 +4,9 @@ #include "ash/wm/panels/panel_window_event_handler.h" -#include "ash/common/wm_shell.h" #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm_shell.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" #include "ui/base/hit_test.h"
diff --git a/ash/wm/panels/panel_window_resizer.cc b/ash/wm/panels/panel_window_resizer.cc index b7a051d8..67a1424 100644 --- a/ash/wm/panels/panel_window_resizer.cc +++ b/ash/wm/panels/panel_window_resizer.cc
@@ -4,7 +4,6 @@ #include "ash/wm/panels/panel_window_resizer.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/public/cpp/window_properties.h" #include "ash/root_window_controller.h" @@ -13,6 +12,7 @@ #include "ash/wm/panels/panel_layout_manager.h" #include "ash/wm/window_parenting_utils.h" #include "ash/wm/window_state.h" +#include "ash/wm_window.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" #include "ui/display/display.h"
diff --git a/ash/wm/panels/panel_window_resizer_unittest.cc b/ash/wm/panels/panel_window_resizer_unittest.cc index 5242a1a..26d0d4afe 100644 --- a/ash/wm/panels/panel_window_resizer_unittest.cc +++ b/ash/wm/panels/panel_window_resizer_unittest.cc
@@ -4,8 +4,6 @@ #include "ash/wm/panels/panel_window_resizer.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shelf_types.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/public/cpp/window_properties.h" @@ -23,6 +21,8 @@ #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/wm_event.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/i18n/rtl.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window_event_dispatcher.h"
diff --git a/ash/wm/power_button_controller.cc b/ash/wm/power_button_controller.cc index 0f88c8dc..9a0f20ab 100644 --- a/ash/wm/power_button_controller.cc +++ b/ash/wm/power_button_controller.cc
@@ -5,10 +5,9 @@ #include "ash/wm/power_button_controller.h" #include "ash/accelerators/accelerator_controller.h" -#include "ash/common/ash_switches.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/ash_switches.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/session/session_state_delegate.h" #include "ash/shell.h" #include "ash/system/audio/tray_audio.h" #include "ash/system/power/tablet_power_button_controller.h" @@ -16,6 +15,7 @@ #include "ash/wm/lock_state_controller.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "ash/wm/session_state_animator.h" +#include "ash/wm_shell.h" #include "base/command_line.h" #include "chromeos/audio/cras_audio_handler.h" #include "chromeos/dbus/dbus_thread_manager.h"
diff --git a/ash/wm/resize_handle_window_targeter.cc b/ash/wm/resize_handle_window_targeter.cc index 2ee505e1..d581286 100644 --- a/ash/wm/resize_handle_window_targeter.cc +++ b/ash/wm/resize_handle_window_targeter.cc
@@ -4,7 +4,7 @@ #include "ash/wm/resize_handle_window_targeter.h" -#include "ash/common/ash_constants.h" +#include "ash/ash_constants.h" #include "ash/shared/immersive_fullscreen_controller.h" #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h"
diff --git a/ash/wm/resize_shadow_and_cursor_unittest.cc b/ash/wm/resize_shadow_and_cursor_unittest.cc index 8c951e2..4c48828 100644 --- a/ash/wm/resize_shadow_and_cursor_unittest.cc +++ b/ash/wm/resize_shadow_and_cursor_unittest.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/ash_constants.h" +#include "ash/ash_constants.h" #include "ash/frame/custom_frame_view_ash.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h"
diff --git a/ash/wm/root_window_finder.cc b/ash/wm/root_window_finder.cc index ae1224b..9d0b0c7 100644 --- a/ash/wm/root_window_finder.cc +++ b/ash/wm/root_window_finder.cc
@@ -4,9 +4,9 @@ #include "ash/wm/root_window_finder.h" -#include "ash/common/wm_window.h" #include "ash/root_window_controller.h" #include "ash/shell.h" +#include "ash/wm_window.h" #include "ui/display/display.h" #include "ui/display/screen.h" #include "ui/gfx/geometry/point.h"
diff --git a/ash/wm/root_window_layout_manager.cc b/ash/wm/root_window_layout_manager.cc index 240f153a..aa7301d 100644 --- a/ash/wm/root_window_layout_manager.cc +++ b/ash/wm/root_window_layout_manager.cc
@@ -4,7 +4,7 @@ #include "ash/wm/root_window_layout_manager.h" -#include "ash/common/wm_window.h" +#include "ash/wm_window.h" #include "ui/aura/window.h" #include "ui/aura/window_tracker.h"
diff --git a/ash/wm/root_window_layout_manager.h b/ash/wm/root_window_layout_manager.h index 3f93c0b..4ea099b 100644 --- a/ash/wm/root_window_layout_manager.h +++ b/ash/wm/root_window_layout_manager.h
@@ -5,7 +5,7 @@ #ifndef ASH_WM_ROOT_WINDOW_LAYOUT_MANAGER_H_ #define ASH_WM_ROOT_WINDOW_LAYOUT_MANAGER_H_ -#include "ash/common/wm_layout_manager.h" +#include "ash/wm_layout_manager.h" #include "base/macros.h" namespace ash {
diff --git a/ash/wm/screen_dimmer.cc b/ash/wm/screen_dimmer.cc index abc0eea..596ce0ace 100644 --- a/ash/wm/screen_dimmer.cc +++ b/ash/wm/screen_dimmer.cc
@@ -4,12 +4,12 @@ #include "ash/wm/screen_dimmer.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" -#include "ash/common/wm_window_user_data.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/wm/container_finder.h" #include "ash/wm/window_dimmer.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" +#include "ash/wm_window_user_data.h" #include "base/memory/ptr_util.h" namespace ash {
diff --git a/ash/wm/screen_dimmer.h b/ash/wm/screen_dimmer.h index 90064bfe..b51eb53 100644 --- a/ash/wm/screen_dimmer.h +++ b/ash/wm/screen_dimmer.h
@@ -9,7 +9,7 @@ #include <vector> #include "ash/ash_export.h" -#include "ash/common/shell_observer.h" +#include "ash/shell_observer.h" #include "base/macros.h" namespace ash {
diff --git a/ash/wm/screen_dimmer_unittest.cc b/ash/wm/screen_dimmer_unittest.cc index 3591a17..186445d1 100644 --- a/ash/wm/screen_dimmer_unittest.cc +++ b/ash/wm/screen_dimmer_unittest.cc
@@ -6,13 +6,13 @@ #include <memory> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" -#include "ash/common/wm_window_user_data.h" #include "ash/root_window_controller.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/wm/window_dimmer.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" +#include "ash/wm_window_user_data.h" #include "base/memory/ptr_util.h" #include "ui/aura/test/test_windows.h" #include "ui/compositor/layer.h"
diff --git a/ash/wm/screen_pinning_controller.cc b/ash/wm/screen_pinning_controller.cc index 3573c809..4137ae4d 100644 --- a/ash/wm/screen_pinning_controller.cc +++ b/ash/wm/screen_pinning_controller.cc
@@ -7,14 +7,14 @@ #include <algorithm> #include <vector> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" -#include "ash/common/wm_window_user_data.h" #include "ash/display/window_tree_host_manager.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/wm/container_finder.h" #include "ash/wm/window_dimmer.h" #include "ash/wm/window_state.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" +#include "ash/wm_window_user_data.h" #include "base/auto_reset.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/ash/wm/screen_pinning_controller_unittest.cc b/ash/wm/screen_pinning_controller_unittest.cc index 5e8019e..09ad957 100644 --- a/ash/wm/screen_pinning_controller_unittest.cc +++ b/ash/wm/screen_pinning_controller_unittest.cc
@@ -7,12 +7,12 @@ #include <vector> #include "ash/accelerators/accelerator_controller.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/test/ash_test_base.h" #include "ash/wm/window_state.h" #include "ash/wm/window_util.h" #include "ash/wm/wm_event.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/stl_util.h" #include "ui/aura/window.h"
diff --git a/ash/wm/session_state_animator.cc b/ash/wm/session_state_animator.cc index 7b5c5029..60a8225 100644 --- a/ash/wm/session_state_animator.cc +++ b/ash/wm/session_state_animator.cc
@@ -4,7 +4,7 @@ #include "ash/wm/session_state_animator.h" -#include "ash/common/ash_switches.h" +#include "ash/ash_switches.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" #include "ash/wm/window_animations.h"
diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc index fdb63c9..3820c6e 100644 --- a/ash/wm/stacking_controller.cc +++ b/ash/wm/stacking_controller.cc
@@ -4,8 +4,8 @@ #include "ash/wm/stacking_controller.h" -#include "ash/common/wm_window.h" #include "ash/wm/container_finder.h" +#include "ash/wm_window.h" namespace ash {
diff --git a/ash/wm/switchable_windows.cc b/ash/wm/switchable_windows.cc index 7eb572d4..6b9e1b00 100644 --- a/ash/wm/switchable_windows.cc +++ b/ash/wm/switchable_windows.cc
@@ -4,8 +4,8 @@ #include "ash/wm/switchable_windows.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/wm_window.h" namespace ash { namespace wm {
diff --git a/ash/wm/system_gesture_event_filter_unittest.cc b/ash/wm/system_gesture_event_filter_unittest.cc index 99944364..9fae50c 100644 --- a/ash/wm/system_gesture_event_filter_unittest.cc +++ b/ash/wm/system_gesture_event_filter_unittest.cc
@@ -7,7 +7,6 @@ #include <vector> #include "ash/accelerators/accelerator_controller.h" -#include "ash/common/wm_window.h" #include "ash/shelf/shelf_model.h" #include "ash/shell.h" #include "ash/system/tray/system_tray_delegate.h" @@ -16,6 +15,7 @@ #include "ash/wm/window_positioning_utils.h" #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm_window.h" #include "base/time/time.h" #include "base/timer/timer.h" #include "ui/aura/env.h"
diff --git a/ash/wm/system_modal_container_event_filter.cc b/ash/wm/system_modal_container_event_filter.cc index 6098b7d..7352ec7 100644 --- a/ash/wm/system_modal_container_event_filter.cc +++ b/ash/wm/system_modal_container_event_filter.cc
@@ -3,8 +3,8 @@ // found in the LICENSE file. #include "ash/wm/system_modal_container_event_filter.h" -#include "ash/common/wm_shell.h" #include "ash/wm/system_modal_container_event_filter_delegate.h" +#include "ash/wm_shell.h" #include "ui/aura/window.h" #include "ui/events/event.h"
diff --git a/ash/wm/system_modal_container_layout_manager.cc b/ash/wm/system_modal_container_layout_manager.cc index 46226cec..010bc4ae 100644 --- a/ash/wm/system_modal_container_layout_manager.cc +++ b/ash/wm/system_modal_container_layout_manager.cc
@@ -6,11 +6,11 @@ #include <cmath> -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/session/session_state_delegate.h" #include "ash/wm/window_dimmer.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/memory/ptr_util.h" #include "base/stl_util.h" #include "ui/aura/client/aura_constants.h"
diff --git a/ash/wm/system_modal_container_layout_manager_unittest.cc b/ash/wm/system_modal_container_layout_manager_unittest.cc index 3669016d..b494443 100644 --- a/ash/wm/system_modal_container_layout_manager_unittest.cc +++ b/ash/wm/system_modal_container_layout_manager_unittest.cc
@@ -6,15 +6,15 @@ #include <memory> -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.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_state_delegate.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/wm/container_finder.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/memory/ptr_util.h"
diff --git a/ash/wm/toplevel_window_event_handler.cc b/ash/wm/toplevel_window_event_handler.cc index 04584c3f..3d4b317 100644 --- a/ash/wm/toplevel_window_event_handler.cc +++ b/ash/wm/toplevel_window_event_handler.cc
@@ -4,10 +4,10 @@ #include "ash/wm/toplevel_window_event_handler.h" -#include "ash/common/wm_window.h" #include "ash/shell.h" #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm_window.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "ui/aura/client/cursor_client.h"
diff --git a/ash/wm/toplevel_window_event_handler_unittest.cc b/ash/wm/toplevel_window_event_handler_unittest.cc index f2d3655..e94001f 100644 --- a/ash/wm/toplevel_window_event_handler_unittest.cc +++ b/ash/wm/toplevel_window_event_handler_unittest.cc
@@ -4,7 +4,6 @@ #include "ash/wm/toplevel_window_event_handler.h" -#include "ash/common/wm_shell.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/shell.h" @@ -16,6 +15,7 @@ #include "ash/wm/window_util.h" #include "ash/wm/wm_event.h" #include "ash/wm/workspace_controller.h" +#include "ash/wm_shell.h" #include "base/compiler_specific.h" #include "base/threading/thread_task_runner_handle.h" #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
diff --git a/ash/wm/video_detector.cc b/ash/wm/video_detector.cc index 8cac55f..14c8fafe 100644 --- a/ash/wm/video_detector.cc +++ b/ash/wm/video_detector.cc
@@ -4,12 +4,12 @@ #include "ash/wm/video_detector.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/aura/env.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h"
diff --git a/ash/wm/video_detector.h b/ash/wm/video_detector.h index 5eb9804..5fd44231a 100644 --- a/ash/wm/video_detector.h +++ b/ash/wm/video_detector.h
@@ -10,7 +10,7 @@ #include <set> #include "ash/ash_export.h" -#include "ash/common/shell_observer.h" +#include "ash/shell_observer.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "base/observer_list.h"
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc index 048aa95..95fd8209 100644 --- a/ash/wm/window_animations.cc +++ b/ash/wm/window_animations.cc
@@ -9,11 +9,11 @@ #include <utility> #include <vector> -#include "ash/common/wm_window.h" #include "ash/shelf/wm_shelf.h" #include "ash/wm/window_animation_types.h" #include "ash/wm/window_util.h" #include "ash/wm/workspace_controller.h" +#include "ash/wm_window.h" #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/ash/wm/window_cycle_controller.cc b/ash/wm/window_cycle_controller.cc index f00183c..9395e7f7 100644 --- a/ash/wm/window_cycle_controller.cc +++ b/ash/wm/window_cycle_controller.cc
@@ -4,15 +4,15 @@ #include "ash/wm/window_cycle_controller.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/metrics/task_switch_source.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/session/session_state_delegate.h" #include "ash/wm/mru_window_tracker.h" #include "ash/wm/window_cycle_event_filter.h" #include "ash/wm/window_cycle_list.h" #include "ash/wm/window_state.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/metrics/histogram_macros.h" namespace ash {
diff --git a/ash/wm/window_cycle_controller_unittest.cc b/ash/wm/window_cycle_controller_unittest.cc index 7e8546376..568325fd 100644 --- a/ash/wm/window_cycle_controller_unittest.cc +++ b/ash/wm/window_cycle_controller_unittest.cc
@@ -7,12 +7,10 @@ #include <algorithm> #include <memory> -#include "ash/common/focus_cycler.h" -#include "ash/common/scoped_root_window_for_new_windows.h" -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/focus_cycler.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/scoped_root_window_for_new_windows.h" +#include "ash/session/session_state_delegate.h" #include "ash/shelf/shelf_widget.h" #include "ash/shelf/wm_shelf.h" #include "ash/shell.h" @@ -26,6 +24,8 @@ #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "ash/wm/wm_event.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/env.h"
diff --git a/ash/wm/window_cycle_event_filter_aura.cc b/ash/wm/window_cycle_event_filter_aura.cc index 9af1c1c..b30de0c 100644 --- a/ash/wm/window_cycle_event_filter_aura.cc +++ b/ash/wm/window_cycle_event_filter_aura.cc
@@ -5,10 +5,10 @@ #include "ash/wm/window_cycle_event_filter_aura.h" #include "ash/accelerators/debug_commands.h" -#include "ash/common/wm_shell.h" #include "ash/shell.h" #include "ash/wm/window_cycle_controller.h" #include "ash/wm/window_cycle_list.h" +#include "ash/wm_shell.h" #include "ui/events/event.h" namespace ash {
diff --git a/ash/wm/window_cycle_list.cc b/ash/wm/window_cycle_list.cc index 0f1ea9a..04109980 100644 --- a/ash/wm/window_cycle_list.cc +++ b/ash/wm/window_cycle_list.cc
@@ -7,12 +7,12 @@ #include <list> #include <map> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/wm/mru_window_tracker.h" #include "ash/wm/window_state.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "ui/accessibility/ax_node_data.h" #include "ui/compositor/scoped_layer_animation_settings.h"
diff --git a/ash/wm/window_dimmer.cc b/ash/wm/window_dimmer.cc index b43c2a83..ab213ad6 100644 --- a/ash/wm/window_dimmer.cc +++ b/ash/wm/window_dimmer.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/time/time.h" #include "ui/aura/window.h" #include "ui/compositor/layer.h"
diff --git a/ash/wm/window_mirror_view.cc b/ash/wm/window_mirror_view.cc index 16f19bf..aa1a60b6 100644 --- a/ash/wm/window_mirror_view.cc +++ b/ash/wm/window_mirror_view.cc
@@ -4,9 +4,9 @@ #include "ash/wm/window_mirror_view.h" -#include "ash/common/wm_window.h" #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm_window.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" #include "ui/compositor/layer.h"
diff --git a/ash/wm/window_parenting_utils.cc b/ash/wm/window_parenting_utils.cc index edf4c835..cb068a19 100644 --- a/ash/wm/window_parenting_utils.cc +++ b/ash/wm/window_parenting_utils.cc
@@ -4,7 +4,7 @@ #include "ash/wm/window_parenting_utils.h" -#include "ash/common/wm_window.h" +#include "ash/wm_window.h" namespace ash { namespace wm {
diff --git a/ash/wm/window_positioner.cc b/ash/wm/window_positioner.cc index b58b153..e513bb4 100644 --- a/ash/wm/window_positioner.cc +++ b/ash/wm/window_positioner.cc
@@ -4,12 +4,12 @@ #include "ash/wm/window_positioner.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/wm/mru_window_tracker.h" #include "ash/wm/window_positioning_utils.h" #include "ash/wm/window_state.h" #include "ash/wm/wm_screen_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/compositor/layer.h" #include "ui/display/display.h" #include "ui/display/screen.h"
diff --git a/ash/wm/window_positioner_unittest.cc b/ash/wm/window_positioner_unittest.cc index 7c5353b31..aa1d02b5 100644 --- a/ash/wm/window_positioner_unittest.cc +++ b/ash/wm/window_positioner_unittest.cc
@@ -6,9 +6,7 @@ #include <string> -#include "ash/common/scoped_root_window_for_new_windows.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/scoped_root_window_for_new_windows.h" #include "ash/shell.h" #include "ash/shell/toplevel_window.h" #include "ash/test/ash_test_base.h" @@ -16,6 +14,8 @@ #include "ash/wm/window_positioner.h" #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/strings/string_number_conversions.h" #include "ui/display/screen.h" #include "ui/views/widget/widget.h"
diff --git a/ash/wm/window_positioning_utils.cc b/ash/wm/window_positioning_utils.cc index 84000a6..a376c7a 100644 --- a/ash/wm/window_positioning_utils.cc +++ b/ash/wm/window_positioning_utils.cc
@@ -6,14 +6,14 @@ #include <algorithm> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/root_window_controller.h" #include "ash/shell.h" #include "ash/wm/system_modal_container_layout_manager.h" #include "ash/wm/window_state.h" #include "ash/wm/wm_event.h" #include "ash/wm/wm_screen_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/aura/window_tracker.h" #include "ui/display/display.h" #include "ui/display/types/display_constants.h"
diff --git a/ash/wm/window_resizer.cc b/ash/wm/window_resizer.cc index 5aa2fd6..3bdb41c 100644 --- a/ash/wm/window_resizer.cc +++ b/ash/wm/window_resizer.cc
@@ -4,11 +4,11 @@ #include "ash/wm/window_resizer.h" -#include "ash/common/wm_window.h" #include "ash/wm/dock/docked_window_layout_manager.h" #include "ash/wm/root_window_finder.h" #include "ash/wm/window_positioning_utils.h" #include "ash/wm/window_state.h" +#include "ash/wm_window.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" #include "ui/display/display.h"
diff --git a/ash/wm/window_state.cc b/ash/wm/window_state.cc index 324c3111..672715f9 100644 --- a/ash/wm/window_state.cc +++ b/ash/wm/window_state.cc
@@ -6,13 +6,13 @@ #include <utility> -#include "ash/common/wm_window.h" #include "ash/wm/default_state.h" #include "ash/wm/window_positioning_utils.h" #include "ash/wm/window_state_delegate.h" #include "ash/wm/window_state_observer.h" #include "ash/wm/wm_event.h" #include "ash/wm/wm_screen_util.h" +#include "ash/wm_window.h" #include "base/auto_reset.h" namespace ash {
diff --git a/ash/wm/window_state_aura.cc b/ash/wm/window_state_aura.cc index 4e3d923..3a38c78 100644 --- a/ash/wm/window_state_aura.cc +++ b/ash/wm/window_state_aura.cc
@@ -4,10 +4,10 @@ #include "ash/wm/window_state_aura.h" -#include "ash/common/wm_window.h" #include "ash/wm/window_properties.h" #include "ash/wm/window_state.h" #include "ash/wm/window_util.h" +#include "ash/wm_window.h" #include "ui/aura/window.h" namespace ash {
diff --git a/ash/wm/window_state_util.cc b/ash/wm/window_state_util.cc index f83de561..dd0983ef 100644 --- a/ash/wm/window_state_util.cc +++ b/ash/wm/window_state_util.cc
@@ -4,9 +4,9 @@ #include "ash/wm/window_state_util.h" -#include "ash/common/wm_window.h" #include "ash/wm/window_state.h" #include "ash/wm/window_state_delegate.h" +#include "ash/wm_window.h" namespace ash { namespace wm {
diff --git a/ash/wm/window_util.cc b/ash/wm/window_util.cc index 5d833c7a..4e2e784 100644 --- a/ash/wm/window_util.cc +++ b/ash/wm/window_util.cc
@@ -6,9 +6,7 @@ #include <vector> -#include "ash/common/ash_constants.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/ash_constants.h" #include "ash/root_window_controller.h" #include "ash/shell.h" #include "ash/wm/window_properties.h" @@ -16,6 +14,8 @@ #include "ash/wm/window_state_aura.h" #include "ash/wm/wm_event.h" #include "ash/wm/wm_screen_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h"
diff --git a/ash/wm/window_util_unittest.cc b/ash/wm/window_util_unittest.cc index 3be9969..4dbb788 100644 --- a/ash/wm/window_util_unittest.cc +++ b/ash/wm/window_util_unittest.cc
@@ -4,11 +4,11 @@ #include "ash/wm/window_util.h" -#include "ash/common/wm_window.h" #include "ash/test/ash_test_base.h" #include "ash/wm/window_positioning_utils.h" #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm_window.h" #include "ui/aura/window.h" #include "ui/display/manager/display_manager.h" #include "ui/display/screen.h"
diff --git a/ash/wm/wm_screen_util.cc b/ash/wm/wm_screen_util.cc index 77ae246..25cfd9f 100644 --- a/ash/wm/wm_screen_util.cc +++ b/ash/wm/wm_screen_util.cc
@@ -4,9 +4,9 @@ #include "ash/wm/wm_screen_util.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/root_window_controller.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/display/display.h" #include "ui/display/screen.h" #include "ui/gfx/geometry/size_conversions.h"
diff --git a/ash/wm/wm_snap_to_pixel_layout_manager.cc b/ash/wm/wm_snap_to_pixel_layout_manager.cc index 740a099..4891cdd 100644 --- a/ash/wm/wm_snap_to_pixel_layout_manager.cc +++ b/ash/wm/wm_snap_to_pixel_layout_manager.cc
@@ -4,9 +4,9 @@ #include "ash/wm/wm_snap_to_pixel_layout_manager.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/wm/window_properties.h" +#include "ash/wm_window.h" #include "base/memory/ptr_util.h" #include "ui/aura/window.h"
diff --git a/ash/wm/wm_snap_to_pixel_layout_manager.h b/ash/wm/wm_snap_to_pixel_layout_manager.h index da98f023..2d201e6 100644 --- a/ash/wm/wm_snap_to_pixel_layout_manager.h +++ b/ash/wm/wm_snap_to_pixel_layout_manager.h
@@ -6,7 +6,7 @@ #define ASH_WM_WM_SNAP_TO_PIXEL_LAYOUT_MANAGER_H_ #include "ash/ash_export.h" -#include "ash/common/wm_layout_manager.h" +#include "ash/wm_layout_manager.h" #include "base/macros.h" namespace ash {
diff --git a/ash/wm/wm_toplevel_window_event_handler.cc b/ash/wm/wm_toplevel_window_event_handler.cc index 6c4eac1..e4532cb 100644 --- a/ash/wm/wm_toplevel_window_event_handler.cc +++ b/ash/wm/wm_toplevel_window_event_handler.cc
@@ -4,12 +4,12 @@ #include "ash/wm/wm_toplevel_window_event_handler.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/wm/window_resizer.h" #include "ash/wm/window_state.h" #include "ash/wm/window_state_observer.h" #include "ash/wm/wm_event.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/aura/window.h" #include "ui/aura/window_observer.h" #include "ui/base/hit_test.h"
diff --git a/ash/wm/wm_toplevel_window_event_handler.h b/ash/wm/wm_toplevel_window_event_handler.h index 0327b5f..9b273f5 100644 --- a/ash/wm/wm_toplevel_window_event_handler.h +++ b/ash/wm/wm_toplevel_window_event_handler.h
@@ -8,8 +8,8 @@ #include <memory> #include "ash/ash_export.h" -#include "ash/common/wm_display_observer.h" #include "ash/wm/wm_types.h" +#include "ash/wm_display_observer.h" #include "base/callback.h" #include "base/macros.h" #include "ui/gfx/geometry/rect.h"
diff --git a/ash/wm/workspace/multi_window_resize_controller.cc b/ash/wm/workspace/multi_window_resize_controller.cc index 6e026131..dc02e31 100644 --- a/ash/wm/workspace/multi_window_resize_controller.cc +++ b/ash/wm/workspace/multi_window_resize_controller.cc
@@ -4,11 +4,11 @@ #include "ash/wm/workspace/multi_window_resize_controller.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/resources/grit/ash_resources.h" #include "ash/root_window_controller.h" #include "ash/wm/workspace/workspace_window_resizer.h" +#include "ash/wm_window.h" #include "ui/base/cursor/cursor.h" #include "ui/base/hit_test.h" #include "ui/base/resource/resource_bundle.h"
diff --git a/ash/wm/workspace/multi_window_resize_controller_unittest.cc b/ash/wm/workspace/multi_window_resize_controller_unittest.cc index 0df8682..afef1fb 100644 --- a/ash/wm/workspace/multi_window_resize_controller_unittest.cc +++ b/ash/wm/workspace/multi_window_resize_controller_unittest.cc
@@ -4,8 +4,7 @@ #include "ash/wm/workspace/multi_window_resize_controller.h" -#include "ash/common/ash_constants.h" -#include "ash/common/wm_window.h" +#include "ash/ash_constants.h" #include "ash/frame/custom_frame_view_ash.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" @@ -14,6 +13,7 @@ #include "ash/wm/window_util.h" #include "ash/wm/workspace_controller.h" #include "ash/wm/workspace_controller_test_helper.h" +#include "ash/wm_window.h" #include "base/stl_util.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/window.h"
diff --git a/ash/wm/workspace/phantom_window_controller.cc b/ash/wm/workspace/phantom_window_controller.cc index 5cb8b4d..143d922 100644 --- a/ash/wm/workspace/phantom_window_controller.cc +++ b/ash/wm/workspace/phantom_window_controller.cc
@@ -6,11 +6,11 @@ #include <math.h> -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/resources/grit/ash_resources.h" #include "ash/root_window_controller.h" #include "ash/wm/root_window_finder.h" +#include "ash/wm_window.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/views/background.h"
diff --git a/ash/wm/workspace/workspace_event_handler.cc b/ash/wm/workspace/workspace_event_handler.cc index e5e96cb0..e01c650 100644 --- a/ash/wm/workspace/workspace_event_handler.cc +++ b/ash/wm/workspace/workspace_event_handler.cc
@@ -4,10 +4,10 @@ #include "ash/wm/workspace/workspace_event_handler.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/wm/window_state.h" #include "ash/wm/wm_event.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "ui/base/hit_test.h" #include "ui/events/event.h"
diff --git a/ash/wm/workspace/workspace_event_handler_aura.cc b/ash/wm/workspace/workspace_event_handler_aura.cc index 495c4bc2e..e7ac65c1 100644 --- a/ash/wm/workspace/workspace_event_handler_aura.cc +++ b/ash/wm/workspace/workspace_event_handler_aura.cc
@@ -4,7 +4,7 @@ #include "ash/wm/workspace/workspace_event_handler_aura.h" -#include "ash/common/wm_window.h" +#include "ash/wm_window.h" #include "ui/aura/window.h" #include "ui/events/event.h"
diff --git a/ash/wm/workspace/workspace_layout_manager.cc b/ash/wm/workspace/workspace_layout_manager.cc index ebfec663..37dd40f 100644 --- a/ash/wm/workspace/workspace_layout_manager.cc +++ b/ash/wm/workspace/workspace_layout_manager.cc
@@ -6,11 +6,9 @@ #include <algorithm> -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm_shell.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_state_delegate.h" #include "ash/shelf/wm_shelf.h" #include "ash/wm/always_on_top_controller.h" #include "ash/wm/fullscreen_window_finder.h" @@ -21,6 +19,8 @@ #include "ash/wm/wm_event.h" #include "ash/wm/wm_screen_util.h" #include "ash/wm/workspace/workspace_layout_manager_backdrop_delegate.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "ui/aura/client/aura_constants.h" #include "ui/base/ui_base_switches.h"
diff --git a/ash/wm/workspace/workspace_layout_manager.h b/ash/wm/workspace/workspace_layout_manager.h index e9410937..ea9cf088 100644 --- a/ash/wm/workspace/workspace_layout_manager.h +++ b/ash/wm/workspace/workspace_layout_manager.h
@@ -9,11 +9,11 @@ #include <set> #include "ash/ash_export.h" -#include "ash/common/shell_observer.h" -#include "ash/common/wm_activation_observer.h" -#include "ash/common/wm_layout_manager.h" +#include "ash/shell_observer.h" #include "ash/wm/window_state_observer.h" #include "ash/wm/wm_types.h" +#include "ash/wm_activation_observer.h" +#include "ash/wm_layout_manager.h" #include "base/macros.h" #include "ui/aura/window_observer.h" #include "ui/display/display_observer.h"
diff --git a/ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc b/ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc index d36493cc..8ac33f9 100644 --- a/ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc +++ b/ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc
@@ -7,16 +7,14 @@ #include <string> #include <utility> -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/shell_observer.h" -#include "ash/common/wm_shell.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_state_delegate.h" #include "ash/shelf/shelf_constants.h" #include "ash/shelf/shelf_layout_manager.h" #include "ash/shelf/wm_shelf.h" #include "ash/shell.h" +#include "ash/shell_observer.h" #include "ash/test/ash_test.h" #include "ash/wm/fullscreen_window_finder.h" #include "ash/wm/maximize_mode/workspace_backdrop_delegate.h" @@ -24,6 +22,8 @@ #include "ash/wm/wm_event.h" #include "ash/wm/wm_screen_util.h" #include "ash/wm/workspace/workspace_window_resizer.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "ui/base/ui_base_switches.h" #include "ui/base/ui_base_types.h"
diff --git a/ash/wm/workspace/workspace_layout_manager_unittest.cc b/ash/wm/workspace/workspace_layout_manager_unittest.cc index 5035364..2b7058d 100644 --- a/ash/wm/workspace/workspace_layout_manager_unittest.cc +++ b/ash/wm/workspace/workspace_layout_manager_unittest.cc
@@ -7,15 +7,13 @@ #include <string> #include <utility> -#include "ash/common/session/session_state_delegate.h" -#include "ash/common/shell_observer.h" -#include "ash/common/wm_shell.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_state_delegate.h" #include "ash/shelf/shelf_constants.h" #include "ash/shelf/shelf_layout_manager.h" #include "ash/shelf/wm_shelf.h" +#include "ash/shell_observer.h" #include "ash/test/ash_test.h" #include "ash/test/test_session_state_delegate.h" #include "ash/wm/fullscreen_window_finder.h" @@ -25,6 +23,8 @@ #include "ash/wm/wm_event.h" #include "ash/wm/wm_screen_util.h" #include "ash/wm/workspace/workspace_window_resizer.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "base/run_loop.h" #include "ui/aura/env.h"
diff --git a/ash/wm/workspace/workspace_window_resizer.cc b/ash/wm/workspace/workspace_window_resizer.cc index 208b400..e9b7760 100644 --- a/ash/wm/workspace/workspace_window_resizer.cc +++ b/ash/wm/workspace/workspace_window_resizer.cc
@@ -9,9 +9,7 @@ #include <utility> #include <vector> -#include "ash/common/ash_switches.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/ash_switches.h" #include "ash/metrics/user_metrics_action.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" @@ -26,6 +24,8 @@ #include "ash/wm/wm_screen_util.h" #include "ash/wm/workspace/phantom_window_controller.h" #include "ash/wm/workspace/two_step_edge_cycler.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/memory/ptr_util.h" #include "base/memory/weak_ptr.h" #include "ui/base/hit_test.h"
diff --git a/ash/wm/workspace/workspace_window_resizer_unittest.cc b/ash/wm/workspace/workspace_window_resizer_unittest.cc index 992bf67c..cd51d37e 100644 --- a/ash/wm/workspace/workspace_window_resizer_unittest.cc +++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc
@@ -4,9 +4,7 @@ #include "ash/wm/workspace/workspace_window_resizer.h" -#include "ash/common/ash_switches.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/ash_switches.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/screen_util.h" #include "ash/shelf/shelf_constants.h" @@ -20,6 +18,8 @@ #include "ash/wm/wm_event.h" #include "ash/wm/workspace/phantom_window_controller.h" #include "ash/wm/workspace_controller.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h"
diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc index feb3e61b..ea413af 100644 --- a/ash/wm/workspace_controller.cc +++ b/ash/wm/workspace_controller.cc
@@ -6,8 +6,6 @@ #include <utility> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/shelf/wm_shelf.h" @@ -18,6 +16,8 @@ #include "ash/wm/workspace/workspace_event_handler.h" #include "ash/wm/workspace/workspace_layout_manager.h" #include "ash/wm/workspace/workspace_layout_manager_backdrop_delegate.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/memory/ptr_util.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h"
diff --git a/ash/wm/workspace_controller_unittest.cc b/ash/wm/workspace_controller_unittest.cc index 50c4c4c12..58bf863 100644 --- a/ash/wm/workspace_controller_unittest.cc +++ b/ash/wm/workspace_controller_unittest.cc
@@ -6,11 +6,9 @@ #include <map> -#include "ash/common/session/session_controller.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/screen_util.h" +#include "ash/session/session_controller.h" #include "ash/shelf/shelf_layout_manager.h" #include "ash/shelf/shelf_widget.h" #include "ash/shelf/wm_shelf.h" @@ -25,6 +23,8 @@ #include "ash/wm/window_util.h" #include "ash/wm/wm_event.h" #include "ash/wm/workspace/workspace_window_resizer.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/strings/string_number_conversions.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/test/test_window_delegate.h"
diff --git a/ash/common/wm_activation_observer.h b/ash/wm_activation_observer.h similarity index 86% rename from ash/common/wm_activation_observer.h rename to ash/wm_activation_observer.h index b2b9a6d..49f8499 100644 --- a/ash/common/wm_activation_observer.h +++ b/ash/wm_activation_observer.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_ACTIVATION_OBSERVER_H_ -#define ASH_COMMON_WM_ACTIVATION_OBSERVER_H_ +#ifndef ASH_WM_ACTIVATION_OBSERVER_H_ +#define ASH_WM_ACTIVATION_OBSERVER_H_ #include "ash/ash_export.h" @@ -29,4 +29,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_ACTIVATION_OBSERVER_H_ +#endif // ASH_WM_ACTIVATION_OBSERVER_H_
diff --git a/ash/common/wm_display_observer.h b/ash/wm_display_observer.h similarity index 81% rename from ash/common/wm_display_observer.h rename to ash/wm_display_observer.h index 7eef1d2..a9c1f0c5 100644 --- a/ash/common/wm_display_observer.h +++ b/ash/wm_display_observer.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_DISPLAY_OBSERVER_H_ -#define ASH_COMMON_WM_DISPLAY_OBSERVER_H_ +#ifndef ASH_WM_DISPLAY_OBSERVER_H_ +#define ASH_WM_DISPLAY_OBSERVER_H_ #include "ash/ash_export.h" @@ -24,4 +24,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_DISPLAY_OBSERVER_H_ +#endif // ASH_WM_DISPLAY_OBSERVER_H_
diff --git a/ash/common/wm_layout_manager.h b/ash/wm_layout_manager.h similarity index 93% rename from ash/common/wm_layout_manager.h rename to ash/wm_layout_manager.h index 76664cd9..63ba80f 100644 --- a/ash/common/wm_layout_manager.h +++ b/ash/wm_layout_manager.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_LAYOUT_MANAGER_H_ -#define ASH_COMMON_WM_LAYOUT_MANAGER_H_ +#ifndef ASH_WM_LAYOUT_MANAGER_H_ +#define ASH_WM_LAYOUT_MANAGER_H_ #include "ash/ash_export.h" @@ -52,4 +52,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_LAYOUT_MANAGER_H_ +#endif // ASH_WM_LAYOUT_MANAGER_H_
diff --git a/ash/common/wm_shell.cc b/ash/wm_shell.cc similarity index 94% rename from ash/common/wm_shell.cc rename to ash/wm_shell.cc index 6bbbe0b3..a2bea2c 100644 --- a/ash/common/wm_shell.cc +++ b/ash/wm_shell.cc
@@ -2,37 +2,33 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm_shell.h" +#include "ash/wm_shell.h" #include <utility> #include "ash/accelerators/accelerator_controller.h" #include "ash/accelerators/ash_focus_manager_factory.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/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/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" @@ -44,6 +40,8 @@ #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" @@ -51,6 +49,8 @@ #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"
diff --git a/ash/common/wm_shell.h b/ash/wm_shell.h similarity index 98% rename from ash/common/wm_shell.h rename to ash/wm_shell.h index eacc525b..2b0a784d 100644 --- a/ash/common/wm_shell.h +++ b/ash/wm_shell.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_SHELL_H_ -#define ASH_COMMON_WM_SHELL_H_ +#ifndef ASH_WM_SHELL_H_ +#define ASH_WM_SHELL_H_ #include <stdint.h> @@ -11,9 +11,9 @@ #include <vector> #include "ash/ash_export.h" -#include "ash/common/session/session_state_observer.h" #include "ash/metrics/gesture_action_type.h" #include "ash/metrics/user_metrics_action.h" +#include "ash/session/session_state_observer.h" #include "ash/wm/lock_state_observer.h" #include "base/observer_list.h" #include "components/ui_devtools/devtools_server.h" @@ -557,4 +557,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_SHELL_H_ +#endif // ASH_WM_SHELL_H_
diff --git a/ash/common/wm_transient_window_observer.h b/ash/wm_transient_window_observer.h similarity index 76% rename from ash/common/wm_transient_window_observer.h rename to ash/wm_transient_window_observer.h index c49ed27..0916f4e 100644 --- a/ash/common/wm_transient_window_observer.h +++ b/ash/wm_transient_window_observer.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_TRANSIENT_WINDOW_OBSERVER_H_ -#define ASH_COMMON_WM_TRANSIENT_WINDOW_OBSERVER_H_ +#ifndef ASH_WM_TRANSIENT_WINDOW_OBSERVER_H_ +#define ASH_WM_TRANSIENT_WINDOW_OBSERVER_H_ #include "ash/ash_export.h" @@ -22,4 +22,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_TRANSIENT_WINDOW_OBSERVER_H_ +#endif // ASH_WM_TRANSIENT_WINDOW_OBSERVER_H_
diff --git a/ash/common/wm_window.cc b/ash/wm_window.cc similarity index 98% rename from ash/common/wm_window.cc rename to ash/wm_window.cc index 38697a1..140e7606 100644 --- a/ash/common/wm_window.cc +++ b/ash/wm_window.cc
@@ -2,13 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm_window.h" +#include "ash/wm_window.h" +#include "ash/ash_constants.h" #include "ash/aura/aura_layout_manager_adapter.h" #include "ash/aura/wm_shell_aura.h" -#include "ash/common/ash_constants.h" -#include "ash/common/wm_layout_manager.h" -#include "ash/common/wm_transient_window_observer.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/public/cpp/window_properties.h" #include "ash/root_window_controller.h" @@ -22,6 +20,8 @@ #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" +#include "ash/wm_layout_manager.h" +#include "ash/wm_transient_window_observer.h" #include "base/memory/ptr_util.h" #include "services/ui/public/interfaces/window_manager_constants.mojom.h" #include "ui/aura/client/aura_constants.h"
diff --git a/ash/common/wm_window.h b/ash/wm_window.h similarity index 98% rename from ash/common/wm_window.h rename to ash/wm_window.h index 4b08cb3..74a3988 100644 --- a/ash/common/wm_window.h +++ b/ash/wm_window.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WINDOW_H_ -#define ASH_COMMON_WM_WINDOW_H_ +#ifndef ASH_WM_WINDOW_H_ +#define ASH_WM_WINDOW_H_ #include <memory> #include <vector> @@ -388,4 +388,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_WINDOW_H_ +#endif // ASH_WM_WINDOW_H_
diff --git a/ash/common/wm_window_unittest.cc b/ash/wm_window_unittest.cc similarity index 98% rename from ash/common/wm_window_unittest.cc rename to ash/wm_window_unittest.cc index 9b69c0b..5ba883c 100644 --- a/ash/common/wm_window_unittest.cc +++ b/ash/wm_window_unittest.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm_window.h" +#include "ash/wm_window.h" #include <memory>
diff --git a/ash/common/wm_window_user_data.h b/ash/wm_window_user_data.h similarity index 92% rename from ash/common/wm_window_user_data.h rename to ash/wm_window_user_data.h index 2a6abd23..172f023 100644 --- a/ash/common/wm_window_user_data.h +++ b/ash/wm_window_user_data.h
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WINDOW_USER_DATA_H_ -#define ASH_COMMON_WM_WINDOW_USER_DATA_H_ +#ifndef ASH_WM_WINDOW_USER_DATA_H_ +#define ASH_WM_WINDOW_USER_DATA_H_ #include <map> #include <memory> #include <utility> -#include "ash/common/wm_window.h" +#include "ash/wm_window.h" #include "base/macros.h" #include "ui/aura/window.h" #include "ui/aura/window_observer.h" @@ -75,4 +75,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_WINDOW_USER_DATA_H_ +#endif // ASH_WM_WINDOW_USER_DATA_H_
diff --git a/ash/common/wm_window_user_data_unittest.cc b/ash/wm_window_user_data_unittest.cc similarity index 93% rename from ash/common/wm_window_user_data_unittest.cc rename to ash/wm_window_user_data_unittest.cc index a8e9695..7db7620a 100644 --- a/ash/common/wm_window_user_data_unittest.cc +++ b/ash/wm_window_user_data_unittest.cc
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm_window_user_data.h" +#include "ash/wm_window_user_data.h" #include <memory> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" -#include "ash/common/wm_window_user_data.h" #include "ash/test/ash_test.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" +#include "ash/wm_window_user_data.h" #include "base/memory/ptr_util.h" namespace ash {
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index 3b311d4..bf19e43 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS
@@ -77,7 +77,7 @@ # Code in chrome should not use ash::SessionStateDelegate and friends. # Instead, use SessionManager/UserManager/SessionControllerClient directly # since they are part of chrome. - "-ash/common/session", + "-ash/session", # Explicitly disallow using SyncMessageFilter to prevent browser from # sending synchronous IPC messages on non-UI threads.
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index ff4735d76..90007dd 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -120,7 +120,7 @@ #endif // ENABLE_EXTENSIONS #if defined(USE_ASH) -#include "ash/common/ash_switches.h" +#include "ash/ash_switches.h" #endif // USE_ASH #if defined(USE_OZONE)
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.cc b/chrome/browser/chromeos/accessibility/accessibility_manager.cc index 198fc23..ba42061f2 100644 --- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc +++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
@@ -10,17 +10,17 @@ #include <memory> #include <utility> +#include "ash/ash_constants.h" #include "ash/autoclick/autoclick_controller.h" #include "ash/autoclick/mus/public/interfaces/autoclick.mojom.h" -#include "ash/common/ash_constants.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/high_contrast/high_contrast_controller.h" #include "ash/root_window_controller.h" #include "ash/shelf/shelf_layout_manager.h" #include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/sticky_keys/sticky_keys_controller.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/callback.h" #include "base/callback_helpers.h" #include "base/command_line.h"
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.h b/chrome/browser/chromeos/accessibility/accessibility_manager.h index 08398c4..cc5a3b69 100644 --- a/chrome/browser/chromeos/accessibility/accessibility_manager.h +++ b/chrome/browser/chromeos/accessibility/accessibility_manager.h
@@ -7,8 +7,8 @@ #include <set> -#include "ash/common/accessibility_types.h" -#include "ash/common/shell_observer.h" +#include "ash/accessibility_types.h" +#include "ash/shell_observer.h" #include "base/callback_forward.h" #include "base/callback_list.h" #include "base/macros.h"
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc b/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc index 1dcfac0..c666b52d 100644 --- a/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" -#include "ash/common/accessibility_types.h" +#include "ash/accessibility_types.h" #include "ash/magnifier/magnification_controller.h" #include "ash/shell.h" #include "base/command_line.h"
diff --git a/chrome/browser/chromeos/accessibility/chromevox_panel.cc b/chrome/browser/chromeos/accessibility/chromevox_panel.cc index 5a008416..8330f92 100644 --- a/chrome/browser/chromeos/accessibility/chromevox_panel.cc +++ b/chrome/browser/chromeos/accessibility/chromevox_panel.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/accessibility_types.h" -#include "ash/common/wm_window.h" +#include "ash/accessibility_types.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/shelf/shelf_layout_manager.h" #include "ash/shelf/wm_shelf.h" #include "ash/shell.h" +#include "ash/wm_window.h" #include "base/macros.h" #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" #include "chrome/browser/chromeos/accessibility/chromevox_panel.h"
diff --git a/chrome/browser/chromeos/accessibility/magnification_manager.cc b/chrome/browser/chromeos/accessibility/magnification_manager.cc index 60b53ba..b6539604 100644 --- a/chrome/browser/chromeos/accessibility/magnification_manager.cc +++ b/chrome/browser/chromeos/accessibility/magnification_manager.cc
@@ -7,7 +7,7 @@ #include <limits> #include <memory> -#include "ash/common/accessibility_types.h" +#include "ash/accessibility_types.h" #include "ash/magnifier/magnification_controller.h" #include "ash/magnifier/partial_magnification_controller.h" #include "ash/shell.h"
diff --git a/chrome/browser/chromeos/accessibility/magnification_manager.h b/chrome/browser/chromeos/accessibility/magnification_manager.h index 6bebda3c..bec48e1 100644 --- a/chrome/browser/chromeos/accessibility/magnification_manager.h +++ b/chrome/browser/chromeos/accessibility/magnification_manager.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_ACCESSIBILITY_MAGNIFICATION_MANAGER_H_ #define CHROME_BROWSER_CHROMEOS_ACCESSIBILITY_MAGNIFICATION_MANAGER_H_ -#include "ash/common/accessibility_types.h" +#include "ash/accessibility_types.h" #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" class Profile;
diff --git a/chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc b/chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc index 77f9eec..d0f6e07 100644 --- a/chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc
@@ -4,7 +4,7 @@ #include <string> -#include "ash/common/accessibility_types.h" +#include "ash/accessibility_types.h" #include "ash/magnifier/magnification_controller.h" #include "ash/shell.h" #include "base/command_line.h"
diff --git a/chrome/browser/chromeos/accessibility/magnification_manager_unittest.cc b/chrome/browser/chromeos/accessibility/magnification_manager_unittest.cc index d2e5bf4b..2b15057 100644 --- a/chrome/browser/chromeos/accessibility/magnification_manager_unittest.cc +++ b/chrome/browser/chromeos/accessibility/magnification_manager_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/chromeos/accessibility/magnification_manager.h" -#include "ash/common/accessibility_types.h" +#include "ash/accessibility_types.h" #include "ash/test/ash_test_base.h" #include "chrome/test/base/testing_profile.h" #include "components/prefs/pref_service.h"
diff --git a/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc b/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc index fea2d160..55aa4fc 100644 --- a/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc
@@ -6,10 +6,10 @@ #include "ash/accelerators/accelerator_controller.h" #include "ash/accelerators/accelerator_table.h" -#include "ash/common/accessibility_types.h" -#include "ash/common/wm_shell.h" +#include "ash/accessibility_types.h" #include "ash/shell.h" #include "ash/system/tray/system_tray.h" +#include "ash/wm_shell.h" #include "base/command_line.h" #include "base/macros.h" #include "base/strings/pattern.h"
diff --git a/chrome/browser/chromeos/accessibility/sticky_keys_browsertest.cc b/chrome/browser/chromeos/accessibility/sticky_keys_browsertest.cc index 73f19ee..b182991 100644 --- a/chrome/browser/chromeos/accessibility/sticky_keys_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/sticky_keys_browsertest.cc
@@ -4,11 +4,11 @@ #include <stddef.h> -#include "ash/common/wm_shell.h" #include "ash/shell.h" #include "ash/sticky_keys/sticky_keys_controller.h" #include "ash/sticky_keys/sticky_keys_overlay.h" #include "ash/system/tray/system_tray.h" +#include "ash/wm_shell.h" #include "base/command_line.h" #include "base/macros.h" #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
diff --git a/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc b/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc index cb42992..9bfa012 100644 --- a/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc
@@ -4,11 +4,11 @@ #include "ui/chromeos/touch_exploration_controller.h" -#include "ash/common/accessibility_delegate.h" -#include "ash/common/accessibility_types.h" -#include "ash/common/wm_shell.h" +#include "ash/accessibility_delegate.h" +#include "ash/accessibility_types.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" +#include "ash/wm_shell.h" #include "base/macros.h" #include "base/test/simple_test_tick_clock.h" #include "base/time/time.h"
diff --git a/chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.cc b/chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.cc index 342d4ba..566d62b 100644 --- a/chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.cc +++ b/chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.h" -#include "ash/common/wm_shell.h" #include "ash/shelf/shelf_delegate.h" +#include "ash/wm_shell.h" #include "base/bind.h" #include "base/command_line.h" #include "base/logging.h"
diff --git a/chrome/browser/chromeos/arc/arc_session_manager.cc b/chrome/browser/chromeos/arc/arc_session_manager.cc index 5d8b8603..64e44ad0 100644 --- a/chrome/browser/chromeos/arc/arc_session_manager.cc +++ b/chrome/browser/chromeos/arc/arc_session_manager.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "ash/common/wm_shell.h" #include "ash/shelf/shelf_delegate.h" +#include "ash/wm_shell.h" #include "base/bind.h" #include "base/callback_helpers.h" #include "base/command_line.h"
diff --git a/chrome/browser/chromeos/arc/boot_phase_monitor/arc_instance_throttle.cc b/chrome/browser/chromeos/arc/boot_phase_monitor/arc_instance_throttle.cc index 9f687f1..044c10e 100644 --- a/chrome/browser/chromeos/arc/boot_phase_monitor/arc_instance_throttle.cc +++ b/chrome/browser/chromeos/arc/boot_phase_monitor/arc_instance_throttle.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/chromeos/arc/boot_phase_monitor/arc_instance_throttle.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/shared/app_types.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/bind.h" #include "base/logging.h" #include "chromeos/dbus/dbus_thread_manager.h"
diff --git a/chrome/browser/chromeos/arc/boot_phase_monitor/arc_instance_throttle.h b/chrome/browser/chromeos/arc/boot_phase_monitor/arc_instance_throttle.h index 00c8f87..37bb0b3c 100644 --- a/chrome/browser/chromeos/arc/boot_phase_monitor/arc_instance_throttle.h +++ b/chrome/browser/chromeos/arc/boot_phase_monitor/arc_instance_throttle.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_ARC_BOOT_PHASE_MONITOR_ARC_INSTANCE_THROTTLE_H_ #define CHROME_BROWSER_CHROMEOS_ARC_BOOT_PHASE_MONITOR_ARC_INSTANCE_THROTTLE_H_ -#include "ash/common/wm_activation_observer.h" +#include "ash/wm_activation_observer.h" #include "base/macros.h" namespace arc {
diff --git a/chrome/browser/chromeos/arc/print/arc_print_service.cc b/chrome/browser/chromeos/arc/print/arc_print_service.cc index 68a409e..3840b3f 100644 --- a/chrome/browser/chromeos/arc/print/arc_print_service.cc +++ b/chrome/browser/chromeos/arc/print/arc_print_service.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "ash/common/shell_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/shell_delegate.h" +#include "ash/wm_shell.h" #include "base/files/file.h" #include "base/files/file_util.h" #include "base/logging.h"
diff --git a/chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service.cc b/chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service.cc index 9cb023b..6c4117a3 100644 --- a/chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service.cc +++ b/chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service.h" -#include "ash/common/wallpaper/wallpaper_controller.h" -#include "ash/common/wm_shell.h" +#include "ash/wallpaper/wallpaper_controller.h" +#include "ash/wm_shell.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/task_scheduler/post_task.h"
diff --git a/chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service.h b/chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service.h index 63d7e45..4ec9edbc 100644 --- a/chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service.h +++ b/chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service.h
@@ -8,7 +8,7 @@ #include <stdint.h> #include <vector> -#include "ash/common/wallpaper/wallpaper_controller_observer.h" +#include "ash/wallpaper/wallpaper_controller_observer.h" #include "base/macros.h" #include "chrome/browser/image_decoder.h" #include "components/arc/arc_service.h"
diff --git a/chrome/browser/chromeos/background/ash_wallpaper_delegate.cc b/chrome/browser/chromeos/background/ash_wallpaper_delegate.cc index 765df3e..b9ae058 100644 --- a/chrome/browser/chromeos/background/ash_wallpaper_delegate.cc +++ b/chrome/browser/chromeos/background/ash_wallpaper_delegate.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/chromeos/background/ash_wallpaper_delegate.h" -#include "ash/common/wallpaper/wallpaper_delegate.h" #include "ash/shell.h" +#include "ash/wallpaper/wallpaper_delegate.h" #include "ash/wm/window_animation_types.h" #include "ash/wm/window_animations.h" #include "base/command_line.h"
diff --git a/chrome/browser/chromeos/customization/customization_wallpaper_downloader_browsertest.cc b/chrome/browser/chromeos/customization/customization_wallpaper_downloader_browsertest.cc index 63becc1c..c632e47 100644 --- a/chrome/browser/chromeos/customization/customization_wallpaper_downloader_browsertest.cc +++ b/chrome/browser/chromeos/customization/customization_wallpaper_downloader_browsertest.cc
@@ -6,8 +6,8 @@ #include <vector> -#include "ash/common/wallpaper/wallpaper_controller.h" -#include "ash/common/wm_shell.h" +#include "ash/wallpaper/wallpaper_controller.h" +#include "ash/wm_shell.h" #include "base/command_line.h" #include "base/files/scoped_temp_dir.h" #include "base/macros.h"
diff --git a/chrome/browser/chromeos/display/display_preferences_unittest.cc b/chrome/browser/chromeos/display/display_preferences_unittest.cc index f28681f..52c42b9fe 100644 --- a/chrome/browser/chromeos/display/display_preferences_unittest.cc +++ b/chrome/browser/chromeos/display/display_preferences_unittest.cc
@@ -10,7 +10,6 @@ #include <utility> #include <vector> -#include "ash/common/wm_shell.h" #include "ash/display/display_util.h" #include "ash/display/json_converter.h" #include "ash/display/resolution_notification_controller.h" @@ -19,6 +18,7 @@ #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm_shell.h" #include "base/macros.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc index fbf1e9d..a10d6788 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc +++ b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
@@ -11,13 +11,13 @@ #include <utility> #include <vector> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/shell.h" #include "ash/wm/mru_window_tracker.h" #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h"
diff --git a/chrome/browser/chromeos/first_run/steps/tray_step.cc b/chrome/browser/chromeos/first_run/steps/tray_step.cc index 53e59d9..5559737 100644 --- a/chrome/browser/chromeos/first_run/steps/tray_step.cc +++ b/chrome/browser/chromeos/first_run/steps/tray_step.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/chromeos/first_run/steps/tray_step.h" -#include "ash/common/wm_shell.h" #include "ash/first_run/first_run_helper.h" #include "ash/shelf/wm_shelf.h" +#include "ash/wm_shell.h" #include "base/i18n/rtl.h" #include "chrome/browser/chromeos/first_run/step_names.h" #include "chrome/browser/ui/webui/chromeos/first_run/first_run_actor.h"
diff --git a/chrome/browser/chromeos/login/chrome_restart_request.cc b/chrome/browser/chromeos/login/chrome_restart_request.cc index d7f81a1..f99af58 100644 --- a/chrome/browser/chromeos/login/chrome_restart_request.cc +++ b/chrome/browser/chromeos/login/chrome_restart_request.cc
@@ -7,7 +7,7 @@ #include <sys/socket.h> #include <vector> -#include "ash/common/ash_switches.h" +#include "ash/ash_switches.h" #include "base/base_switches.h" #include "base/command_line.h" #include "base/macros.h"
diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc index c340e46..736c4c6 100644 --- a/chrome/browser/chromeos/login/kiosk_browsertest.cc +++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc
@@ -6,9 +6,9 @@ #include <vector> #include "apps/test/app_window_waiter.h" -#include "ash/common/wallpaper/wallpaper_controller.h" -#include "ash/common/wallpaper/wallpaper_controller_observer.h" -#include "ash/common/wm_shell.h" +#include "ash/wallpaper/wallpaper_controller.h" +#include "ash/wallpaper/wallpaper_controller_observer.h" +#include "ash/wm_shell.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/location.h"
diff --git a/chrome/browser/chromeos/login/lock/screen_locker.cc b/chrome/browser/chromeos/login/lock/screen_locker.cc index 198e31b..987e78d 100644 --- a/chrome/browser/chromeos/login/lock/screen_locker.cc +++ b/chrome/browser/chromeos/login/lock/screen_locker.cc
@@ -7,14 +7,14 @@ #include <string> #include <vector> -#include "ash/common/wallpaper/wallpaper_controller.h" -#include "ash/common/wm_shell.h" #include "ash/shell.h" +#include "ash/wallpaper/wallpaper_controller.h" #include "ash/wm/lock_state_controller.h" #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "ash/wm/wm_event.h" +#include "ash/wm_shell.h" #include "base/bind.h" #include "base/command_line.h" #include "base/lazy_instance.h"
diff --git a/chrome/browser/chromeos/login/lock/webui_screen_locker.cc b/chrome/browser/chromeos/login/lock/webui_screen_locker.cc index 43360baa..d41baa53 100644 --- a/chrome/browser/chromeos/login/lock/webui_screen_locker.cc +++ b/chrome/browser/chromeos/login/lock/webui_screen_locker.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/chromeos/login/lock/webui_screen_locker.h" -#include "ash/common/wm_shell.h" #include "ash/shell.h" #include "ash/system/power/power_event_observer.h" +#include "ash/wm_shell.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/chromeos/login/lock/webui_screen_locker.h b/chrome/browser/chromeos/login/lock/webui_screen_locker.h index 2e7bfdf..dedf9ec 100644 --- a/chrome/browser/chromeos/login/lock/webui_screen_locker.h +++ b/chrome/browser/chromeos/login/lock/webui_screen_locker.h
@@ -10,7 +10,7 @@ #include <memory> #include <string> -#include "ash/common/shell_observer.h" +#include "ash/shell_observer.h" #include "ash/wm/lock_state_observer.h" #include "base/macros.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/login/login_browsertest.cc b/chrome/browser/chromeos/login/login_browsertest.cc index ab912aa..4e139a2 100644 --- a/chrome/browser/chromeos/login/login_browsertest.cc +++ b/chrome/browser/chromeos/login/login_browsertest.cc
@@ -4,10 +4,10 @@ #include <string> -#include "ash/common/wm_window.h" #include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/system/tray/system_tray.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "base/location.h" #include "base/single_thread_task_runner.h"
diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc b/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc index 5ef2acb..b8df27b 100644 --- a/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc +++ b/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "ash/common/wallpaper/wallpaper_controller.h" -#include "ash/common/wm_shell.h" +#include "ash/wallpaper/wallpaper_controller.h" +#include "ash/wm_shell.h" #include "base/memory/ptr_util.h" #include "base/rand_util.h" #include "base/values.h"
diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc index b89722b..d6a14ec5 100644 --- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc +++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
@@ -7,12 +7,12 @@ #include <utility> #include <vector> -#include "ash/common/wallpaper/wallpaper_controller.h" -#include "ash/common/wallpaper/wallpaper_delegate.h" -#include "ash/common/wm_shell.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" #include "ash/system/tray/system_tray.h" +#include "ash/wallpaper/wallpaper_controller.h" +#include "ash/wallpaper/wallpaper_delegate.h" +#include "ash/wm_shell.h" #include "base/bind.h" #include "base/command_line.h" #include "base/location.h"
diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.h b/chrome/browser/chromeos/login/ui/login_display_host_impl.h index d7041af..8cac4582 100644 --- a/chrome/browser/chromeos/login/ui/login_display_host_impl.h +++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "ash/common/shell_observer.h" +#include "ash/shell_observer.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/login/app_launch_controller.h"
diff --git a/chrome/browser/chromeos/login/ui/webui_login_view.cc b/chrome/browser/chromeos/login/ui/webui_login_view.cc index ecee0155..5a41639 100644 --- a/chrome/browser/chromeos/login/ui/webui_login_view.cc +++ b/chrome/browser/chromeos/login/ui/webui_login_view.cc
@@ -4,10 +4,10 @@ #include "chrome/browser/chromeos/login/ui/webui_login_view.h" -#include "ash/common/focus_cycler.h" -#include "ash/common/wm_shell.h" +#include "ash/focus_cycler.h" #include "ash/shell.h" #include "ash/system/tray/system_tray.h" +#include "ash/wm_shell.h" #include "base/bind.h" #include "base/callback.h" #include "base/i18n/rtl.h"
diff --git a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc index 1811306..4dabecc0 100644 --- a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc +++ b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
@@ -10,7 +10,7 @@ #include <set> #include <utility> -#include "ash/common/multi_profile_uma.h" +#include "ash/multi_profile_uma.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h"
diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc index 78bbda38..42b91c5 100644 --- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc +++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc
@@ -6,10 +6,10 @@ #include <utility> -#include "ash/common/ash_constants.h" -#include "ash/common/wallpaper/wallpaper_controller.h" -#include "ash/common/wm_shell.h" +#include "ash/ash_constants.h" #include "ash/public/interfaces/constants.mojom.h" +#include "ash/wallpaper/wallpaper_controller.h" +#include "ash/wm_shell.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h"
diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc index 11bf9fd..1d6c0e6 100644 --- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc +++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc
@@ -6,9 +6,9 @@ #include <stddef.h> -#include "ash/common/wallpaper/wallpaper_controller.h" -#include "ash/common/wm_shell.h" #include "ash/shell.h" +#include "ash/wallpaper/wallpaper_controller.h" +#include "ash/wm_shell.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/files/file_path.h"
diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc index 17b8e64..d21de80 100644 --- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc +++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "ash/common/wallpaper/wallpaper_controller.h" -#include "ash/common/wallpaper/wallpaper_controller_observer.h" -#include "ash/common/wm_shell.h" +#include "ash/wallpaper/wallpaper_controller.h" +#include "ash/wallpaper/wallpaper_controller_observer.h" +#include "ash/wm_shell.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/files/file_path.h"
diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.h b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.h index 131f78ca..be5df8e 100644 --- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.h +++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.h
@@ -7,7 +7,7 @@ #include <vector> -#include "ash/common/ash_constants.h" +#include "ash/ash_constants.h" #include "ui/gfx/image/image_skia.h" namespace base {
diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc index bb21659..1a60c2ec 100644 --- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc +++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/chromeos/login/wizard_controller.h" -#include "ash/common/accessibility_types.h" +#include "ash/accessibility_types.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/macros.h"
diff --git a/chrome/browser/chromeos/net/DEPS b/chrome/browser/chromeos/net/DEPS index 1776e3d..0db9e54 100644 --- a/chrome/browser/chromeos/net/DEPS +++ b/chrome/browser/chromeos/net/DEPS
@@ -10,7 +10,7 @@ "network_portal_notification_controller\.cc": [ "+ash/system/system_notifier.h", "+ash/system/tray/system_tray_notifier.h", - "+ash/common/wm_shell.h", + "+ash/wm_shell.h", ], "network_state_notifier\.cc": [ "+ash/system/system_notifier.h",
diff --git a/chrome/browser/chromeos/net/network_portal_notification_controller.cc b/chrome/browser/chromeos/net/network_portal_notification_controller.cc index ebf12e9..6b9f23da 100644 --- a/chrome/browser/chromeos/net/network_portal_notification_controller.cc +++ b/chrome/browser/chromeos/net/network_portal_notification_controller.cc
@@ -9,9 +9,9 @@ #include <memory> #include <vector> -#include "ash/common/wm_shell.h" #include "ash/system/system_notifier.h" #include "ash/system/tray/system_tray_notifier.h" +#include "ash/wm_shell.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/macros.h"
diff --git a/chrome/browser/chromeos/note_taking_helper_unittest.cc b/chrome/browser/chromeos/note_taking_helper_unittest.cc index 86480d7..13eea5ab 100644 --- a/chrome/browser/chromeos/note_taking_helper_unittest.cc +++ b/chrome/browser/chromeos/note_taking_helper_unittest.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "ash/common/ash_switches.h" +#include "ash/ash_switches.h" #include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h"
diff --git a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc index 6970f55a..c35e04f7 100644 --- a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc +++ b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc
@@ -11,7 +11,7 @@ #include <utility> #include <vector> -#include "ash/common/accessibility_types.h" +#include "ash/accessibility_types.h" #include "base/callback.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h"
diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc index 3a43b35..b108bb9 100644 --- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc +++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
@@ -13,9 +13,9 @@ #include <utility> #include <vector> -#include "ash/common/wm_shell.h" #include "ash/system/session/logout_confirmation_controller.h" #include "ash/system/session/logout_confirmation_dialog.h" +#include "ash/wm_shell.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h"
diff --git a/chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc b/chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc index 4f778be..3035d66 100644 --- a/chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc +++ b/chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/login_status.h" -#include "ash/common/wm_shell.h" +#include "ash/login_status.h" #include "ash/shell.h" #include "ash/system/date/date_default_view.h" #include "ash/system/date/date_view.h" #include "ash/system/date/system_info_default_view.h" #include "ash/system/date/tray_system_info.h" #include "ash/system/tray/system_tray.h" +#include "ash/wm_shell.h" #include "base/command_line.h" #include "base/location.h" #include "base/macros.h"
diff --git a/chrome/browser/chromeos/policy/display_rotation_default_handler.cc b/chrome/browser/chromeos/policy/display_rotation_default_handler.cc index 0e08358..6f1c3b3 100644 --- a/chrome/browser/chromeos/policy/display_rotation_default_handler.cc +++ b/chrome/browser/chromeos/policy/display_rotation_default_handler.cc
@@ -6,8 +6,8 @@ #include <stddef.h> -#include "ash/common/wm_shell.h" #include "ash/shell.h" +#include "ash/wm_shell.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/location.h"
diff --git a/chrome/browser/chromeos/policy/display_rotation_default_handler.h b/chrome/browser/chromeos/policy/display_rotation_default_handler.h index db4e62b..78d99f0 100644 --- a/chrome/browser/chromeos/policy/display_rotation_default_handler.h +++ b/chrome/browser/chromeos/policy/display_rotation_default_handler.h
@@ -10,8 +10,8 @@ #include <memory> #include <set> -#include "ash/common/shell_observer.h" #include "ash/display/window_tree_host_manager.h" +#include "ash/shell_observer.h" #include "base/macros.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "ui/display/display.h"
diff --git a/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc b/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc index c439032..a60e978 100644 --- a/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc +++ b/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc
@@ -4,7 +4,7 @@ #include <string> -#include "ash/common/accessibility_types.h" +#include "ash/accessibility_types.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h"
diff --git a/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc b/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc index 16742a0c..ac50b96 100644 --- a/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc +++ b/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "ash/common/accessibility_types.h" +#include "ash/accessibility_types.h" #include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "base/test/test_simple_task_runner.h"
diff --git a/chrome/browser/chromeos/power/login_lock_state_notifier.cc b/chrome/browser/chromeos/power/login_lock_state_notifier.cc index f0e79cf..1414d3b 100644 --- a/chrome/browser/chromeos/power/login_lock_state_notifier.cc +++ b/chrome/browser/chromeos/power/login_lock_state_notifier.cc
@@ -4,10 +4,10 @@ #include "chrome/browser/chromeos/power/login_lock_state_notifier.h" -#include "ash/common/login_status.h" -#include "ash/common/wm_shell.h" +#include "ash/login_status.h" #include "ash/shell.h" #include "ash/system/tray/system_tray_delegate.h" +#include "ash/wm_shell.h" #include "base/logging.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/chromeos/login/lock/screen_locker.h"
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc index 49f21a1..8ad429b 100644 --- a/chrome/browser/chromeos/preferences.cc +++ b/chrome/browser/chromeos/preferences.cc
@@ -6,11 +6,11 @@ #include <vector> +#include "ash/accessibility_types.h" +#include "ash/ash_constants.h" #include "ash/autoclick/autoclick_controller.h" -#include "ash/common/accessibility_types.h" -#include "ash/common/ash_constants.h" -#include "ash/common/wm_shell.h" #include "ash/shell.h" +#include "ash/wm_shell.h" #include "base/command_line.h" #include "base/i18n/time_formatting.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/chromeos/preferences.h b/chrome/browser/chromeos/preferences.h index 1df63fa2..2066282 100644 --- a/chrome/browser/chromeos/preferences.h +++ b/chrome/browser/chromeos/preferences.h
@@ -7,7 +7,7 @@ #include <string> -#include "ash/common/shell_observer.h" +#include "ash/shell_observer.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "chrome/browser/chromeos/language_preferences.h"
diff --git a/chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.cc b/chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.cc index 843ad2a..6584a20c 100644 --- a/chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.cc +++ b/chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.h" -#include "ash/common/multi_profile_uma.h" -#include "ash/common/wm_shell.h" +#include "ash/multi_profile_uma.h" #include "ash/system/tray/system_tray_delegate.h" +#include "ash/wm_shell.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_avatar_icon_util.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/chromeos/shutdown_policy_browsertest.cc b/chrome/browser/chromeos/shutdown_policy_browsertest.cc index 75eb4ec..e343388 100644 --- a/chrome/browser/chromeos/shutdown_policy_browsertest.cc +++ b/chrome/browser/chromeos/shutdown_policy_browsertest.cc
@@ -5,7 +5,7 @@ #include <memory> #include <string> -#include "ash/common/login_status.h" +#include "ash/login_status.h" #include "ash/shell.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/date/date_default_view.h"
diff --git a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc index 580144f..4ce2857 100644 --- a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc +++ b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/accessibility_types.h" -#include "ash/common/login_status.h" +#include "ash/accessibility_types.h" +#include "ash/login_status.h" #include "ash/magnifier/magnification_controller.h" #include "ash/shell.h" #include "ash/system/tray/system_tray.h"
diff --git a/chrome/browser/chromeos/ui/accessibility_cursor_ring_layer.cc b/chrome/browser/chromeos/ui/accessibility_cursor_ring_layer.cc index 205403ed..b948f40 100644 --- a/chrome/browser/chromeos/ui/accessibility_cursor_ring_layer.cc +++ b/chrome/browser/chromeos/ui/accessibility_cursor_ring_layer.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/chromeos/ui/accessibility_cursor_ring_layer.h" -#include "ash/common/wm_window.h" #include "ash/display/window_tree_host_manager.h" #include "ash/shell.h" +#include "ash/wm_window.h" #include "base/bind.h" #include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/core/SkPath.h"
diff --git a/chrome/browser/chromeos/ui/screen_capture_notification_ui_chromeos.cc b/chrome/browser/chromeos/ui/screen_capture_notification_ui_chromeos.cc index ede233a..e800723 100644 --- a/chrome/browser/chromeos/ui/screen_capture_notification_ui_chromeos.cc +++ b/chrome/browser/chromeos/ui/screen_capture_notification_ui_chromeos.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/chromeos/ui/screen_capture_notification_ui_chromeos.h" -#include "ash/common/wm_shell.h" #include "ash/system/tray/system_tray_notifier.h" +#include "ash/wm_shell.h" namespace chromeos {
diff --git a/chrome/browser/extensions/api/automation/automation_apitest.cc b/chrome/browser/extensions/api/automation/automation_apitest.cc index c4fa962b6..a51ee34 100644 --- a/chrome/browser/extensions/api/automation/automation_apitest.cc +++ b/chrome/browser/extensions/api/automation/automation_apitest.cc
@@ -34,7 +34,7 @@ #if defined(OS_CHROMEOS) #include "ash/accelerators/accelerator_controller.h" -#include "ash/common/wm_shell.h" +#include "ash/wm_shell.h" #include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h" #endif
diff --git a/chrome/browser/extensions/bookmark_app_helper.cc b/chrome/browser/extensions/bookmark_app_helper.cc index d1a8dbbe..b9320c6 100644 --- a/chrome/browser/extensions/bookmark_app_helper.cc +++ b/chrome/browser/extensions/bookmark_app_helper.cc
@@ -76,8 +76,8 @@ #endif // defined(OS_WIN) #if defined(USE_ASH) -#include "ash/common/wm_shell.h" // nogncheck #include "ash/shelf/shelf_delegate.h" // nogncheck +#include "ash/wm_shell.h" // nogncheck #endif namespace {
diff --git a/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc b/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc index 3c797009..afa2cc3 100644 --- a/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc +++ b/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc
@@ -6,11 +6,11 @@ #include <stdint.h> -#include "ash/common/wm_shell.h" #include "ash/display/screen_orientation_controller_chromeos.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm_shell.h" #include "base/command_line.h" #include "base/macros.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/extensions/global_shortcut_listener_chromeos.cc b/chrome/browser/extensions/global_shortcut_listener_chromeos.cc index fec16ba9..c6f26f83 100644 --- a/chrome/browser/extensions/global_shortcut_listener_chromeos.cc +++ b/chrome/browser/extensions/global_shortcut_listener_chromeos.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/extensions/global_shortcut_listener_chromeos.h" #include "ash/accelerators/accelerator_controller.h" -#include "ash/common/wm_shell.h" +#include "ash/wm_shell.h" #include "content/public/browser/browser_thread.h" using content::BrowserThread;
diff --git a/chrome/browser/memory/tab_manager.cc b/chrome/browser/memory/tab_manager.cc index b6893503..04be7c3 100644 --- a/chrome/browser/memory/tab_manager.cc +++ b/chrome/browser/memory/tab_manager.cc
@@ -55,8 +55,8 @@ #include "content/public/common/page_importance_signals.h" #if defined(OS_CHROMEOS) -#include "ash/common/multi_profile_uma.h" -#include "ash/common/wm_shell.h" +#include "ash/multi_profile_uma.h" +#include "ash/wm_shell.h" #include "chrome/browser/memory/tab_manager_delegate_chromeos.h" #include "components/user_manager/user_manager.h" #endif
diff --git a/chrome/browser/notifications/login_state_notification_blocker_chromeos.cc b/chrome/browser/notifications/login_state_notification_blocker_chromeos.cc index 86de30c..f4eeb9e7 100644 --- a/chrome/browser/notifications/login_state_notification_blocker_chromeos.cc +++ b/chrome/browser/notifications/login_state_notification_blocker_chromeos.cc
@@ -4,10 +4,10 @@ #include "chrome/browser/notifications/login_state_notification_blocker_chromeos.h" -#include "ash/common/wm_shell.h" #include "ash/root_window_controller.h" #include "ash/system/system_notifier.h" #include "ash/wm/window_properties.h" +#include "ash/wm_shell.h" #include "chrome/browser/chrome_notification_types.h" #include "content/public/browser/notification_service.h" #include "ui/aura/window.h"
diff --git a/chrome/browser/notifications/login_state_notification_blocker_chromeos.h b/chrome/browser/notifications/login_state_notification_blocker_chromeos.h index aa19f2af..4d24bb5 100644 --- a/chrome/browser/notifications/login_state_notification_blocker_chromeos.h +++ b/chrome/browser/notifications/login_state_notification_blocker_chromeos.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_NOTIFICATIONS_LOGIN_STATE_NOTIFICATION_BLOCKER_CHROMEOS_H_ #define CHROME_BROWSER_NOTIFICATIONS_LOGIN_STATE_NOTIFICATION_BLOCKER_CHROMEOS_H_ -#include "ash/common/shell_observer.h" +#include "ash/shell_observer.h" #include "base/macros.h" #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" #include "chromeos/login/login_state.h"
diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc index 803684c3..e05895fc 100644 --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -64,7 +64,7 @@ #endif #if defined(OS_CHROMEOS) -#include "ash/common/accessibility_types.h" +#include "ash/accessibility_types.h" #include "chrome/browser/chromeos/platform_keys/key_permissions_policy_handler.h" #include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h" #include "chrome/browser/policy/default_geolocation_policy_handler.h"
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index a3b281c..1e3ce06b 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc
@@ -197,9 +197,9 @@ #if defined(OS_CHROMEOS) #include "ash/accelerators/accelerator_controller.h" #include "ash/accelerators/accelerator_table.h" -#include "ash/common/accessibility_types.h" -#include "ash/common/wm_shell.h" +#include "ash/accessibility_types.h" #include "ash/shell.h" +#include "ash/wm_shell.h" #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" #include "chrome/browser/chromeos/accessibility/magnification_manager.h" #include "chrome/browser/chromeos/arc/arc_session_manager.h"
diff --git a/chrome/browser/prefs/chrome_command_line_pref_store.cc b/chrome/browser/prefs/chrome_command_line_pref_store.cc index ebfecf62..d69d17d 100644 --- a/chrome/browser/prefs/chrome_command_line_pref_store.cc +++ b/chrome/browser/prefs/chrome_command_line_pref_store.cc
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "ash/common/ash_switches.h" +#include "ash/ash_switches.h" #include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/chrome/browser/resources/chromeos/chromevox/testing/chromevox_e2e_test_base.js b/chrome/browser/resources/chromeos/chromevox/testing/chromevox_e2e_test_base.js index 407de8f..0cdf1cd 100644 --- a/chrome/browser/resources/chromeos/chromevox/testing/chromevox_e2e_test_base.js +++ b/chrome/browser/resources/chromeos/chromevox/testing/chromevox_e2e_test_base.js
@@ -35,7 +35,7 @@ /** @override */ testGenCppIncludes: function() { GEN_BLOCK(function() {/*! -#include "ash/common/accessibility_delegate.h" +#include "ash/accessibility_delegate.h" #include "base/bind.h" #include "base/callback.h" #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
diff --git a/chrome/browser/resources/settings/device_page/device_page_browser_proxy.js b/chrome/browser/resources/settings/device_page/device_page_browser_proxy.js index e9a0c39..34d616d4 100644 --- a/chrome/browser/resources/settings/device_page/device_page_browser_proxy.js +++ b/chrome/browser/resources/settings/device_page/device_page_browser_proxy.js
@@ -6,7 +6,7 @@ cr.exportPath('settings'); /** - * Mirrors DeviceType from ash/common/system/chromeos/power/power_status.h. + * Mirrors DeviceType from ash/system/power/power_status.h. * @enum {number} */ settings.PowerDeviceType = {
diff --git a/chrome/browser/ui/ash/DEPS b/chrome/browser/ui/ash/DEPS index 37fd364d..440add1 100644 --- a/chrome/browser/ui/ash/DEPS +++ b/chrome/browser/ui/ash/DEPS
@@ -14,6 +14,6 @@ # This is temporary rule before SessionStateDelegate(ChromeOS) can be fully # removed. "session_state_delegate_chromeos\.(cc|h)": [ - "+ash/common/session", + "+ash/session", ] }
diff --git a/chrome/browser/ui/ash/accelerator_commands_browsertest.cc b/chrome/browser/ui/ash/accelerator_commands_browsertest.cc index 079059c..dc55b9f 100644 --- a/chrome/browser/ui/ash/accelerator_commands_browsertest.cc +++ b/chrome/browser/ui/ash/accelerator_commands_browsertest.cc
@@ -5,10 +5,10 @@ #include "ash/accelerators/accelerator_commands.h" #include "ash/accelerators/accelerator_commands_aura.h" -#include "ash/common/wm_window.h" #include "ash/shell.h" #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "base/macros.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/ash/accelerator_controller_browsertest.cc b/chrome/browser/ui/ash/accelerator_controller_browsertest.cc index 9c94c65d..936639cd 100644 --- a/chrome/browser/ui/ash/accelerator_controller_browsertest.cc +++ b/chrome/browser/ui/ash/accelerator_controller_browsertest.cc
@@ -4,10 +4,10 @@ #include "ash/accelerators/accelerator_controller.h" -#include "ash/common/wm_shell.h" #include "ash/shell.h" #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm_shell.h" #include "build/build_config.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc b/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc index b13fc15..17e789e 100644 --- a/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc +++ b/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/ash/app_list/app_list_controller_ash.h" -#include "ash/common/wm_shell.h" #include "ash/shelf/shelf_delegate.h" #include "ash/shell.h" +#include "ash/wm_shell.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h"
diff --git a/chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc b/chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc index 0e97237..aa2cb36 100644 --- a/chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc +++ b/chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc
@@ -4,12 +4,12 @@ #include <memory> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shelf/app_list_button.h" #include "ash/shelf/shelf_widget.h" #include "ash/shelf/wm_shelf.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/run_loop.h" #include "chrome/test/base/in_process_browser_test.h" #include "ui/app_list/presenter/app_list.h"
diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc index fe09e3ae..4f8b4de6 100644 --- a/chrome/browser/ui/ash/ash_init.cc +++ b/chrome/browser/ui/ash/ash_init.cc
@@ -6,13 +6,13 @@ #include "ash/accelerators/accelerator_controller.h" #include "ash/accelerators/accelerator_controller_delegate_aura.h" -#include "ash/common/accessibility_types.h" -#include "ash/common/wm_shell.h" +#include "ash/accessibility_types.h" #include "ash/high_contrast/high_contrast_controller.h" #include "ash/magnifier/magnification_controller.h" #include "ash/magnifier/partial_magnification_controller.h" #include "ash/shell.h" #include "ash/shell_init_params.h" +#include "ash/wm_shell.h" #include "base/command_line.h" #include "base/sys_info.h" #include "base/threading/sequenced_worker_pool.h"
diff --git a/chrome/browser/ui/ash/ash_util.cc b/chrome/browser/ui/ash/ash_util.cc index 059b59e..7497290 100644 --- a/chrome/browser/ui/ash/ash_util.cc +++ b/chrome/browser/ui/ash/ash_util.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/ui/ash/ash_util.h" #include "ash/accelerators/accelerator_controller.h" -#include "ash/common/mojo_interface_factory.h" -#include "ash/common/wm_shell.h" +#include "ash/mojo_interface_factory.h" +#include "ash/wm_shell.h" #include "base/macros.h" #include "build/build_config.h" #include "chrome/browser/ui/ash/ash_init.h"
diff --git a/chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc b/chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc index bc259a4..8d73333bc 100644 --- a/chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc +++ b/chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/new_window_controller.h" -#include "ash/common/wm_shell.h" +#include "ash/new_window_controller.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc index 7f5914c9cc..46dd8a02 100644 --- a/chrome/browser/ui/ash/chrome_shell_delegate.cc +++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -10,16 +10,16 @@ #include "ash/accelerators/magnifier_key_scroller.h" #include "ash/accelerators/spoken_feedback_toggler.h" -#include "ash/common/accessibility_delegate.h" -#include "ash/common/accessibility_types.h" -#include "ash/common/wallpaper/wallpaper_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/content/gpu_support_impl.h" #include "ash/shell.h" +#include "ash/wallpaper/wallpaper_delegate.h" #include "ash/wm/mru_window_tracker.h" #include "ash/wm/window_state.h" #include "ash/wm/window_util.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"
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.h b/chrome/browser/ui/ash/chrome_shell_delegate.h index bebc20d..0bff55ab 100644 --- a/chrome/browser/ui/ash/chrome_shell_delegate.h +++ b/chrome/browser/ui/ash/chrome_shell_delegate.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "ash/common/shell_delegate.h" +#include "ash/shell_delegate.h" #include "base/macros.h" #include "build/build_config.h" #include "content/public/browser/notification_observer.h"
diff --git a/chrome/browser/ui/ash/ime_controller_chromeos.h b/chrome/browser/ui/ash/ime_controller_chromeos.h index e05a6b8..339e1f28 100644 --- a/chrome/browser/ui/ash/ime_controller_chromeos.h +++ b/chrome/browser/ui/ash/ime_controller_chromeos.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_ASH_IME_CONTROLLER_CHROMEOS_H_ #define CHROME_BROWSER_UI_ASH_IME_CONTROLLER_CHROMEOS_H_ -#include "ash/common/ime_control_delegate.h" +#include "ash/ime_control_delegate.h" #include "base/compiler_specific.h" #include "base/macros.h"
diff --git a/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc b/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc index 8b0fe5c..f24c079 100644 --- a/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc +++ b/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm_shell.h" #include "ash/shelf/shelf_delegate.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" #include "base/macros.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc index 586c3a95..91a78cb0 100644 --- a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc +++ b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc
@@ -5,8 +5,6 @@ #include <string> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/display/screen_orientation_controller_chromeos.h" #include "ash/shared/app_types.h" #include "ash/shelf/shelf_delegate.h" @@ -16,6 +14,8 @@ #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/bind.h" #include "base/memory/ptr_util.h" #include "chrome/browser/chromeos/arc/arc_support_host.h"
diff --git a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h index 18f3fc90..b37fd95 100644 --- a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h +++ b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h
@@ -9,7 +9,7 @@ #include <memory> #include <vector> -#include "ash/common/shell_observer.h" +#include "ash/shell_observer.h" #include "base/macros.h" #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" #include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h"
diff --git a/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc index cd6e7b79..761ebc35 100644 --- a/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc +++ b/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
@@ -7,14 +7,14 @@ #include <limits> #include <vector> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shelf_application_menu_item.h" #include "ash/resources/grit/ash_resources.h" #include "ash/shelf/shelf_delegate.h" #include "ash/shelf/shelf_model.h" #include "ash/wm/window_properties.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/memory/ptr_util.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc index a3e2171..4c821d5 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
@@ -8,9 +8,7 @@ #include <vector> -#include "ash/common/multi_profile_uma.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/multi_profile_uma.h" #include "ash/resources/grit/ash_resources.h" #include "ash/root_window_controller.h" #include "ash/shelf/shelf_model.h" @@ -19,6 +17,8 @@ #include "ash/strings/grit/ash_strings.h" #include "ash/system/tray/system_tray_delegate.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "base/macros.h" #include "base/strings/pattern.h"
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc index bae868fc0..4d43b076 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
@@ -6,8 +6,6 @@ #include <stddef.h> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/window_properties.h" #include "ash/shelf/app_list_button.h" #include "ash/shelf/shelf_button.h" @@ -22,6 +20,8 @@ #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/macros.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc index 2e35e27..b1dbc92dd 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
@@ -14,7 +14,6 @@ #include <utility> #include <vector> -#include "ash/common/wm_shell.h" #include "ash/display/screen_orientation_controller_chromeos.h" #include "ash/shelf/shelf_application_menu_model.h" #include "ash/shelf/shelf_constants.h" @@ -27,6 +26,7 @@ #include "ash/test/test_shell_delegate.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/files/file_path.h"
diff --git a/chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc b/chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc index 61e577bb..756c64f5 100644 --- a/chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc +++ b/chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc
@@ -4,11 +4,11 @@ #include "chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/shelf/shelf_delegate.h" #include "ash/wm/window_properties.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc b/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc index ec28364..b53ca7a 100644 --- a/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc +++ b/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/ash/launcher/extension_launcher_context_menu.h" -#include "ash/common/wm_shell.h" #include "ash/shelf/shelf_item_delegate.h" +#include "ash/wm_shell.h" #include "base/bind.h" #include "chrome/browser/extensions/context_menu_matcher.h" #include "chrome/browser/extensions/extension_util.h"
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc index 42c6bef..a1f8c8c 100644 --- a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc +++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
@@ -6,12 +6,12 @@ #include <string> -#include "ash/common/wallpaper/wallpaper_delegate.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/shelf/shelf_model.h" #include "ash/shelf/wm_shelf.h" #include "ash/strings/grit/ash_strings.h" +#include "ash/wallpaper/wallpaper_delegate.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "build/build_config.h" #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" #include "chrome/browser/fullscreen.h"
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc index f9d27c9..27a014d7 100644 --- a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc +++ b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
@@ -6,12 +6,12 @@ #include <memory> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/root_window_controller.h" #include "ash/shelf/shelf_item_types.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/macros.h" #include "base/memory/ptr_util.h" #include "chrome/app/chrome_command_ids.h"
diff --git a/chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc b/chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc index 4dd7f76..42e13a9 100644 --- a/chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc +++ b/chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/window_properties.h" #include "ash/shelf/shelf_item_types.h" +#include "ash/wm_window.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc index 7a99ea1..a5e2efbb 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc +++ b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/ash/multi_user/multi_user_context_menu.h" -#include "ash/common/multi_profile_uma.h" +#include "ash/multi_profile_uma.h" #include "base/bind.h" #include "base/callback.h" #include "base/macros.h"
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc index 0c1ec15..5ec57762 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc +++ b/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm_shell.h" #include "ash/system/system_notifier.h" #include "ash/test/ash_test_base.h" #include "ash/test/test_shell_delegate.h" +#include "ash/wm_shell.h" #include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc index 7f5b97b..0d0fa56 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc +++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" -#include "ash/common/multi_profile_uma.h" -#include "ash/common/shell_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/multi_profile_uma.h" +#include "ash/shell_delegate.h" +#include "ash/wm_shell.h" #include "base/logging.h" #include "build/build_config.h" #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc index eae23e6..d79d726d 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc +++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
@@ -4,15 +4,15 @@ #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h" -#include "ash/common/media_controller.h" -#include "ash/common/multi_profile_uma.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/media_controller.h" +#include "ash/multi_profile_uma.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/auto_reset.h" #include "base/macros.h" #include "base/message_loop/message_loop.h"
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc index 542ac6b..7936ae3 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc +++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
@@ -4,8 +4,6 @@ #include <stddef.h> -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/content/shell_content_state.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shelf/shelf_widget.h" @@ -22,6 +20,8 @@ #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "ash/wm/wm_event.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/compiler_specific.h" #include "base/logging.h" #include "base/macros.h"
diff --git a/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc b/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc index a11acf62..ce1af63 100644 --- a/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc +++ b/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc
@@ -4,19 +4,19 @@ #include "chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.h" -#include "ash/common/wallpaper/wallpaper_delegate.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/root_window_controller.h" #include "ash/shelf/shelf_layout_manager.h" #include "ash/shelf/shelf_widget.h" #include "ash/shelf/wm_shelf.h" #include "ash/shell.h" +#include "ash/wallpaper/wallpaper_delegate.h" #include "ash/wm/mru_window_tracker.h" #include "ash/wm/window_positioner.h" #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/macros.h" #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
diff --git a/chrome/browser/ui/ash/multi_user/user_switch_util.cc b/chrome/browser/ui/ash/multi_user/user_switch_util.cc index 81d62d8..1f919c5 100644 --- a/chrome/browser/ui/ash/multi_user/user_switch_util.cc +++ b/chrome/browser/ui/ash/multi_user/user_switch_util.cc
@@ -4,12 +4,12 @@ #include "chrome/browser/ui/ash/multi_user/user_switch_util.h" -#include "ash/common/wm_shell.h" #include "ash/shell.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/screen_security/screen_tray_item.h" #include "ash/system/tray/system_tray.h" #include "ash/wm/overview/window_selector_controller.h" +#include "ash/wm_shell.h" #include "chrome/browser/ui/simple_message_box.h" #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/ui/ash/multi_user/user_switch_util_unittest.cc b/chrome/browser/ui/ash/multi_user/user_switch_util_unittest.cc index e7e825b..42a8a16e8 100644 --- a/chrome/browser/ui/ash/multi_user/user_switch_util_unittest.cc +++ b/chrome/browser/ui/ash/multi_user/user_switch_util_unittest.cc
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm_shell.h" #include "ash/system/screen_security/screen_tray_item.h" #include "ash/system/tray/system_tray.h" #include "ash/test/ash_test_base.h" #include "ash/wm/overview/window_selector_controller.h" +#include "ash/wm_shell.h" #include "base/run_loop.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/ui/ash/multi_user/user_switch_util.h"
diff --git a/chrome/browser/ui/ash/networking_config_delegate_chromeos_browsertest.cc b/chrome/browser/ui/ash/networking_config_delegate_chromeos_browsertest.cc index e28a3a73..53c22d0 100644 --- a/chrome/browser/ui/ash/networking_config_delegate_chromeos_browsertest.cc +++ b/chrome/browser/ui/ash/networking_config_delegate_chromeos_browsertest.cc
@@ -4,13 +4,13 @@ #include "chrome/browser/ui/ash/networking_config_delegate_chromeos.h" -#include "ash/common/login_status.h" -#include "ash/common/wm_shell.h" +#include "ash/login_status.h" #include "ash/root_window_controller.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/network/network_detailed_view.h" #include "ash/system/network/tray_network.h" #include "ash/system/tray/system_tray.h" +#include "ash/wm_shell.h" #include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/ash/palette_delegate_chromeos.h b/chrome/browser/ui/ash/palette_delegate_chromeos.h index 6d358dee..e153148f 100644 --- a/chrome/browser/ui/ash/palette_delegate_chromeos.h +++ b/chrome/browser/ui/ash/palette_delegate_chromeos.h
@@ -7,7 +7,7 @@ #include <string> -#include "ash/common/palette_delegate.h" +#include "ash/palette_delegate.h" #include "base/callback_list.h" #include "base/macros.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ui/ash/session_state_delegate_chromeos.cc b/chrome/browser/ui/ash/session_state_delegate_chromeos.cc index 5398f749..9b9f49d 100644 --- a/chrome/browser/ui/ash/session_state_delegate_chromeos.cc +++ b/chrome/browser/ui/ash/session_state_delegate_chromeos.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h" -#include "ash/common/session/session_state_observer.h" -#include "ash/common/wm_window.h" #include "ash/content/shell_content_state.h" +#include "ash/session/session_state_observer.h" +#include "ash/wm_window.h" #include "base/bind.h" #include "base/callback.h" #include "base/command_line.h"
diff --git a/chrome/browser/ui/ash/session_state_delegate_chromeos.h b/chrome/browser/ui/ash/session_state_delegate_chromeos.h index 4ef9ca60..2fea8e0 100644 --- a/chrome/browser/ui/ash/session_state_delegate_chromeos.h +++ b/chrome/browser/ui/ash/session_state_delegate_chromeos.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_ASH_SESSION_STATE_DELEGATE_CHROMEOS_H_ #define CHROME_BROWSER_UI_ASH_SESSION_STATE_DELEGATE_CHROMEOS_H_ -#include "ash/common/session/session_state_delegate.h" +#include "ash/session/session_state_delegate.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "base/observer_list.h"
diff --git a/chrome/browser/ui/ash/session_util.cc b/chrome/browser/ui/ash/session_util.cc index 4a112321..d62e97db 100644 --- a/chrome/browser/ui/ash/session_util.cc +++ b/chrome/browser/ui/ash/session_util.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/ash/session_util.h" -#include "ash/common/wm_shell.h" #include "ash/content/shell_content_state.h" #include "ash/resources/grit/ash_resources.h" +#include "ash/wm_shell.h" #include "build/build_config.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/ash/shelf_browsertest.cc b/chrome/browser/ui/ash/shelf_browsertest.cc index 1c12f73..419b0fb 100644 --- a/chrome/browser/ui/ash/shelf_browsertest.cc +++ b/chrome/browser/ui/ash/shelf_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm_window.h" #include "ash/shelf/shelf_layout_manager.h" #include "ash/shelf/wm_shelf.h" +#include "ash/wm_window.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/ui/ash/system_tray_client.cc b/chrome/browser/ui/ash/system_tray_client.cc index 82d88b1..337a50cf 100644 --- a/chrome/browser/ui/ash/system_tray_client.cc +++ b/chrome/browser/ui/ash/system_tray_client.cc
@@ -4,11 +4,11 @@ #include "chrome/browser/ui/ash/system_tray_client.h" -#include "ash/common/login_status.h" -#include "ash/common/wm_shell.h" +#include "ash/login_status.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/public/interfaces/constants.mojom.h" #include "ash/shell.h" +#include "ash/wm_shell.h" #include "base/feature_list.h" #include "base/logging.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/ash/system_tray_client_browsertest.cc b/chrome/browser/ui/ash/system_tray_client_browsertest.cc index 0db45993..c6382de 100644 --- a/chrome/browser/ui/ash/system_tray_client_browsertest.cc +++ b/chrome/browser/ui/ash/system_tray_client_browsertest.cc
@@ -4,10 +4,10 @@ #include "chrome/browser/ui/ash/system_tray_client.h" -#include "ash/common/wm_shell.h" #include "ash/root_window_controller.h" #include "ash/system/tray/system_tray.h" #include "ash/system/update/tray_update.h" +#include "ash/wm_shell.h" #include "chrome/browser/upgrade_detector.h" #include "chrome/test/base/in_process_browser_test.h" #include "content/public/test/test_utils.h"
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc index 8ece5852..cf665e79 100644 --- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc +++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
@@ -13,9 +13,8 @@ #include <utility> #include <vector> -#include "ash/common/login_status.h" -#include "ash/common/shell_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/login_status.h" +#include "ash/shell_delegate.h" #include "ash/system/bluetooth/bluetooth_observer.h" #include "ash/system/date/clock_observer.h" #include "ash/system/ime/ime_observer.h" @@ -25,6 +24,7 @@ #include "ash/system/tray/system_tray_notifier.h" #include "ash/system/tray_accessibility.h" #include "ash/system/user/user_observer.h" +#include "ash/wm_shell.h" #include "base/bind_helpers.h" #include "base/callback.h" #include "base/logging.h"
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h index 8d4a5b98..dc7acd99 100644 --- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h +++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "ash/common/accessibility_types.h" +#include "ash/accessibility_types.h" #include "ash/system/supervised/custodian_info_tray_observer.h" #include "ash/system/tray/ime_info.h" #include "ash/system/tray/system_tray_delegate.h"
diff --git a/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc b/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc index bc33b114..4a1e81a 100644 --- a/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc +++ b/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc
@@ -4,11 +4,11 @@ #include <vector> -#include "ash/common/wm_shell.h" #include "ash/shell.h" #include "ash/system/tray/system_tray.h" #include "ash/system/tray/system_tray_delegate.h" #include "ash/test/tray_cast_test_api.h" +#include "ash/wm_shell.h" #include "base/macros.h" #include "chrome/browser/media/router/media_routes_observer.h" #include "chrome/browser/media/router/media_sinks_observer.h"
diff --git a/chrome/browser/ui/ash/volume_controller_browsertest.cc b/chrome/browser/ui/ash/volume_controller_browsertest.cc index 06db9c4..d66c8fcc 100644 --- a/chrome/browser/ui/ash/volume_controller_browsertest.cc +++ b/chrome/browser/ui/ash/volume_controller_browsertest.cc
@@ -5,8 +5,8 @@ #include <memory> #include <vector> -#include "ash/common/accessibility_delegate.h" -#include "ash/common/accessibility_types.h" +#include "ash/accessibility_delegate.h" +#include "ash/accessibility_types.h" #include "base/command_line.h" #include "base/macros.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/ash/window_positioner_unittest.cc b/chrome/browser/ui/ash/window_positioner_unittest.cc index c758b6c..c78681d 100644 --- a/chrome/browser/ui/ash/window_positioner_unittest.cc +++ b/chrome/browser/ui/ash/window_positioner_unittest.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "ash/common/wm_shell.h" #include "ash/test/ash_test_base.h" #include "ash/wm/window_resizer.h" +#include "ash/wm_shell.h" #include "base/logging.h" #include "base/macros.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc index ca1e73f3..311cfaf 100644 --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc
@@ -21,8 +21,8 @@ #include "ui/views/widget/widget.h" #if defined(USE_ASH) -#include "ash/common/wm_shell.h" // nogncheck #include "ash/shelf/shelf_delegate.h" // nogncheck +#include "ash/wm_shell.h" // nogncheck #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h" // nogncheck #endif
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc index 78abdfe..7ba1bde2 100644 --- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc +++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
@@ -5,9 +5,8 @@ #include "chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.h" #include "apps/ui/views/app_window_frame_view.h" -#include "ash/common/ash_constants.h" -#include "ash/common/ash_switches.h" -#include "ash/common/wm_window.h" +#include "ash/ash_constants.h" +#include "ash/ash_switches.h" #include "ash/frame/custom_frame_view_ash.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/public/cpp/window_properties.h" @@ -21,6 +20,7 @@ #include "ash/wm/window_state_aura.h" #include "ash/wm/window_state_delegate.h" #include "ash/wm/window_state_observer.h" +#include "ash/wm_window.h" #include "chrome/browser/chromeos/note_taking_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/ash/ash_util.h"
diff --git a/chrome/browser/ui/views/chrome_views_delegate_chromeos.cc b/chrome/browser/ui/views/chrome_views_delegate_chromeos.cc index 1db6f37e..91f4a38 100644 --- a/chrome/browser/ui/views/chrome_views_delegate_chromeos.cc +++ b/chrome/browser/ui/views/chrome_views_delegate_chromeos.cc
@@ -5,10 +5,10 @@ #include "chrome/browser/ui/views/chrome_views_delegate.h" #include "ash/accelerators/accelerator_controller.h" -#include "ash/common/wm_shell.h" #include "ash/shell.h" #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm_shell.h" #include "base/bind.h" #include "base/message_loop/message_loop.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/browser/ui/views/frame/browser_frame_ash.cc b/chrome/browser/ui/views/frame/browser_frame_ash.cc index 3d73ee2..93bf0399 100644 --- a/chrome/browser/ui/views/frame/browser_frame_ash.cc +++ b/chrome/browser/ui/views/frame/browser_frame_ash.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/frame/browser_frame_ash.h" -#include "ash/common/ash_switches.h" +#include "ash/ash_switches.h" #include "ash/shell.h" #include "ash/wm/window_properties.h" #include "ash/wm/window_state.h"
diff --git a/chrome/browser/ui/views/frame/browser_header_painter_ash.cc b/chrome/browser/ui/views/frame/browser_header_painter_ash.cc index 3142cbd6..0e01b17 100644 --- a/chrome/browser/ui/views/frame/browser_header_painter_ash.cc +++ b/chrome/browser/ui/views/frame/browser_header_painter_ash.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/frame/browser_header_painter_ash.h" -#include "ash/common/ash_layout_constants.h" +#include "ash/ash_layout_constants.h" #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" #include "ash/frame/header_painter_util.h" #include "ash/resources/vector_icons/vector_icons.h"
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc index 708d0a2..3e3145f5 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
@@ -6,13 +6,13 @@ #include <algorithm> -#include "ash/common/ash_layout_constants.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/ash_layout_constants.h" #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" #include "ash/frame/default_header_painter.h" #include "ash/frame/frame_border_hit_test.h" #include "ash/frame/header_painter_util.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/feature_list.h" #include "build/build_config.h" #include "chrome/browser/profiles/profiles_state.h"
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h index efaf216..bb5b174 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h
@@ -7,7 +7,7 @@ #include <memory> -#include "ash/common/shell_observer.h" +#include "ash/shell_observer.h" #include "base/gtest_prod_util.h" #include "base/macros.h" #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc index ec29999..46a6668 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc
@@ -4,13 +4,13 @@ #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h" -#include "ash/common/ash_constants.h" -#include "ash/common/wm_shell.h" +#include "ash/ash_constants.h" #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" #include "ash/frame/header_painter.h" #include "ash/shell.h" #include "ash/test/immersive_fullscreen_controller_test_api.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm_shell.h" #include "base/command_line.h" #include "build/build_config.h" #include "chrome/browser/profiles/profile_avatar_icon_util.h"
diff --git a/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc b/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc index 6dbcc82e..61a435ce 100644 --- a/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc
@@ -12,7 +12,7 @@ #include "ui/views/focus/focus_manager.h" #if defined(USE_ASH) -#include "ash/common/ash_switches.h" +#include "ash/ash_switches.h" #endif #if defined(USE_AURA)
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc index 59966b1..d922f05 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc +++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h" -#include "ash/common/material_design/material_design_controller.h" +#include "ash/material_design/material_design_controller.h" #include "ash/shared/immersive_revealed_lock.h" #include "ash/shell.h" #include "ash/wm/window_state.h"
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc index 734c9bc3..3a52201 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc +++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -42,10 +42,10 @@ #if defined(USE_ASH) #include "ash/accelerators/accelerator_commands.h" // nogncheck -#include "ash/common/wm_shell.h" // nogncheck #include "ash/wm/maximize_mode/maximize_mode_controller.h" // nogncheck #include "ash/wm/window_state.h" // nogncheck #include "ash/wm/window_state_aura.h" // nogncheck +#include "ash/wm_shell.h" // nogncheck #include "ui/wm/core/coordinate_conversion.h" // nogncheck #endif
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc index 768e71b..3547445 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc +++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
@@ -62,8 +62,7 @@ #endif #if defined(USE_ASH) -#include "ash/common/ash_switches.h" -#include "ash/common/wm_window.h" +#include "ash/ash_switches.h" #include "ash/shell.h" #include "ash/test/cursor_manager_test_api.h" #include "ash/test/immersive_fullscreen_controller_test_api.h" @@ -71,6 +70,7 @@ #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" +#include "ash/wm_window.h" #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" #include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h" #include "ui/aura/client/screen_position_client.h"
diff --git a/chrome/browser/ui/views/tabs/window_finder_ash.cc b/chrome/browser/ui/views/tabs/window_finder_ash.cc index ab91890d..c544da3 100644 --- a/chrome/browser/ui/views/tabs/window_finder_ash.cc +++ b/chrome/browser/ui/views/tabs/window_finder_ash.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/views/tabs/window_finder.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/wm/root_window_finder.h" +#include "ash/wm_window.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h"
diff --git a/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc b/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc index 0454650..569990b 100644 --- a/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc +++ b/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc
@@ -7,8 +7,8 @@ #include <stdint.h> #include <utility> -#include "ash/common/wm_shell.h" #include "ash/system/tray/system_tray_delegate.h" +#include "ash/wm_shell.h" #include "base/bind.h" #include "base/macros.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc b/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc index 3e36a293..c1a2c663 100644 --- a/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc +++ b/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/webui/chromeos/first_run/first_run_ui.h" -#include "ash/common/wm_shell.h" #include "ash/shelf/wm_shelf.h" +#include "ash/wm_shell.h" #include "base/command_line.h" #include "base/memory/ptr_util.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc index db15811..e3a2701 100644 --- a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
@@ -6,7 +6,7 @@ #include <type_traits> -#include "ash/common/accessibility_types.h" +#include "ash/accessibility_types.h" #include "ash/shell.h" #include "base/bind.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index e2f43eb..9ceddffd 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -118,7 +118,7 @@ #endif #if defined(OS_CHROMEOS) -#include "ash/common/accessibility_types.h" // nogncheck +#include "ash/accessibility_types.h" // nogncheck #include "ash/shell.h" // nogncheck #include "ash/system/devicetype_utils.h" // nogncheck #include "chrome/browser/browser_process_platform_part.h" @@ -151,7 +151,7 @@ #endif #if defined(USE_ASH) -#include "ash/common/wm_shell.h" // nogncheck +#include "ash/wm_shell.h" // nogncheck #endif using base::UserMetricsAction;
diff --git a/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc b/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc index 94a0a30..fd956743 100644 --- a/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc
@@ -9,8 +9,8 @@ #include <memory> #include <utility> -#include "ash/common/new_window_controller.h" -#include "ash/common/wm_shell.h" +#include "ash/new_window_controller.h" +#include "ash/wm_shell.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h"
diff --git a/chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.cc b/chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.cc index 72c7134..953deb39 100644 --- a/chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.cc +++ b/chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h" -#include "ash/common/new_window_controller.h" -#include "ash/common/wm_shell.h" +#include "ash/new_window_controller.h" +#include "ash/wm_shell.h" #include "base/bind.h" #include "base/command_line.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc index 7f4801d..2d12c4a 100644 --- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
@@ -33,7 +33,7 @@ #include "ui/base/l10n/l10n_util.h" #if defined(OS_CHROMEOS) -#include "ash/common/ash_switches.h" +#include "ash/ash_switches.h" #include "ash/system/devicetype_utils.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/ui/webui/chromeos/network_element_localized_strings_provider.h"
diff --git a/chrome/browser/ui/window_sizer/window_sizer.cc b/chrome/browser/ui/window_sizer/window_sizer.cc index f3c4ea6..7b508b86 100644 --- a/chrome/browser/ui/window_sizer/window_sizer.cc +++ b/chrome/browser/ui/window_sizer/window_sizer.cc
@@ -23,7 +23,7 @@ #include "ui/display/screen.h" #if defined(USE_ASH) -#include "ash/common/ash_switches.h" +#include "ash/ash_switches.h" #include "ash/shell.h" // nogncheck #include "ash/wm/window_positioner.h" // nogncheck #include "chrome/browser/ui/ash/ash_util.h" // nogncheck
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash.cc b/chrome/browser/ui/window_sizer/window_sizer_ash.cc index afb0aed2..ba4b9a0 100644 --- a/chrome/browser/ui/window_sizer/window_sizer_ash.cc +++ b/chrome/browser/ui/window_sizer/window_sizer_ash.cc
@@ -4,10 +4,10 @@ #include "chrome/browser/ui/window_sizer/window_sizer.h" -#include "ash/common/wm_window.h" #include "ash/shell.h" #include "ash/wm/window_positioner.h" #include "ash/wm/window_state.h" +#include "ash/wm_window.h" #include "chrome/browser/ui/ash/ash_util.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc index 4fa16e6c..adca27e 100644 --- a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc +++ b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm_window.h" #include "ash/shelf/shelf_view.h" #include "ash/shelf/wm_shelf.h" #include "ash/shell.h" +#include "ash/wm_window.h" #include "base/command_line.h" #include "base/location.h" #include "base/macros.h"
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc index e61b306..98ccdc8 100644 --- a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc +++ b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
@@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/scoped_root_window_for_new_windows.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/scoped_root_window_for_new_windows.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/wm/window_positioner.h" #include "ash/wm/window_resizer.h" #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/memory/ptr_util.h" #include "build/build_config.h" #include "chrome/browser/ui/ash/ash_util.h"
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 49f6b5d..61113d3 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc
@@ -14,7 +14,7 @@ // ----------------------------------------------------------------------------- // Can't find the switch you are looking for? Try looking in: -// ash/common/ash_switches.cc +// ash/ash_switches.cc // base/base_switches.cc // chromeos/chromeos_switches.cc // etc.
diff --git a/components/arc/intent_helper/arc_intent_helper_bridge.cc b/components/arc/intent_helper/arc_intent_helper_bridge.cc index 953b249c..b4167dbd 100644 --- a/components/arc/intent_helper/arc_intent_helper_bridge.cc +++ b/components/arc/intent_helper/arc_intent_helper_bridge.cc
@@ -6,11 +6,11 @@ #include <utility> -#include "ash/common/new_window_controller.h" -#include "ash/common/shell_delegate.h" -#include "ash/common/wallpaper/wallpaper_controller.h" -#include "ash/common/wm_shell.h" +#include "ash/new_window_controller.h" #include "ash/shell.h" +#include "ash/shell_delegate.h" +#include "ash/wallpaper/wallpaper_controller.h" +#include "ash/wm_shell.h" #include "base/memory/weak_ptr.h" #include "components/arc/arc_bridge_service.h" #include "components/arc/arc_service_manager.h"
diff --git a/components/exo/pointer_unittest.cc b/components/exo/pointer_unittest.cc index 9dbe73ea0..5948f95c 100644 --- a/components/exo/pointer_unittest.cc +++ b/components/exo/pointer_unittest.cc
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" #include "ash/wm/window_positioning_utils.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "components/exo/buffer.h" #include "components/exo/pointer.h" #include "components/exo/pointer_delegate.h"
diff --git a/components/exo/shell_surface.cc b/components/exo/shell_surface.cc index 1083866de..4c605aa1 100644 --- a/components/exo/shell_surface.cc +++ b/components/exo/shell_surface.cc
@@ -6,7 +6,6 @@ #include <algorithm> -#include "ash/common/wm_window.h" #include "ash/frame/custom_frame_view_ash.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shelf/wm_shelf.h" @@ -14,6 +13,7 @@ #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" +#include "ash/wm_window.h" #include "base/logging.h" #include "base/macros.h" #include "base/memory/ptr_util.h"
diff --git a/components/exo/shell_surface_unittest.cc b/components/exo/shell_surface_unittest.cc index 86bd001..307eab6 100644 --- a/components/exo/shell_surface_unittest.cc +++ b/components/exo/shell_surface_unittest.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/accessibility_delegate.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "ash/accessibility_delegate.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/wm_event.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "base/message_loop/message_loop.h" #include "base/strings/utf_string_conversions.h" #include "components/exo/buffer.h"
diff --git a/components/exo/test/exo_test_helper.cc b/components/exo/test/exo_test_helper.cc index 45a00396..9cf0253 100644 --- a/components/exo/test/exo_test_helper.cc +++ b/components/exo/test/exo_test_helper.cc
@@ -4,10 +4,10 @@ #include "components/exo/test/exo_test_helper.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/wm/window_positioner.h" #include "ash/wm/window_positioning_utils.h" +#include "ash/wm_window.h" #include "components/exo/buffer.h" #include "components/exo/shell_surface.h" #include "components/exo/surface.h"
diff --git a/components/exo/touch_unittest.cc b/components/exo/touch_unittest.cc index 8b9ed93..2bbf572 100644 --- a/components/exo/touch_unittest.cc +++ b/components/exo/touch_unittest.cc
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" #include "ash/wm/window_positioner.h" #include "ash/wm/window_positioning_utils.h" +#include "ash/wm_shell.h" +#include "ash/wm_window.h" #include "components/exo/buffer.h" #include "components/exo/shell_surface.h" #include "components/exo/surface.h"
diff --git a/components/exo/wm_helper_ash.cc b/components/exo/wm_helper_ash.cc index 273af51e..3a6e50b 100644 --- a/components/exo/wm_helper_ash.cc +++ b/components/exo/wm_helper_ash.cc
@@ -4,11 +4,11 @@ #include "components/exo/wm_helper_ash.h" -#include "ash/common/accessibility_delegate.h" -#include "ash/common/wm_shell.h" +#include "ash/accessibility_delegate.h" #include "ash/shell.h" #include "ash/system/tray/system_tray_notifier.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm_shell.h" #include "base/memory/singleton.h" #include "ui/aura/client/focus_client.h" #include "ui/display/manager/display_manager.h"
diff --git a/components/exo/wm_helper_ash.h b/components/exo/wm_helper_ash.h index a8ace31..ac1788e 100644 --- a/components/exo/wm_helper_ash.h +++ b/components/exo/wm_helper_ash.h
@@ -5,7 +5,7 @@ #ifndef COMPONENTS_EXO_WM_HELPER_ASH_H_ #define COMPONENTS_EXO_WM_HELPER_ASH_H_ -#include "ash/common/shell_observer.h" +#include "ash/shell_observer.h" #include "ash/system/accessibility_observer.h" #include "base/macros.h" #include "components/exo/wm_helper.h"
diff --git a/remoting/host/disconnect_window_chromeos.cc b/remoting/host/disconnect_window_chromeos.cc index 367bd58..2f77612 100644 --- a/remoting/host/disconnect_window_chromeos.cc +++ b/remoting/host/disconnect_window_chromeos.cc
@@ -4,8 +4,8 @@ #include <string> -#include "ash/common/wm_shell.h" #include "ash/system/tray/system_tray_notifier.h" +#include "ash/wm_shell.h" #include "base/bind.h" #include "base/macros.h" #include "base/memory/ptr_util.h"
diff --git a/ui/arc/notification/arc_notification_manager.cc b/ui/arc/notification/arc_notification_manager.cc index 3810bb3..956283f8 100644 --- a/ui/arc/notification/arc_notification_manager.cc +++ b/ui/arc/notification/arc_notification_manager.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "ash/common/wm_shell.h" #include "ash/system/toast/toast_manager.h" +#include "ash/wm_shell.h" #include "base/memory/ptr_util.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h"