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

Landing this right after the M58 branch will complicate backports. I'm
going to land it right before the M59 branch.

This reverts commit 775aa60.

Original description:
Now that mustash can use standard aura windows we don't need the ash/aura
vs. ash/mus vs. ash/common distinction. Eliminate //ash/common. Also move
files in //ash/common/system/chromeos out to //ash/system because ash only
compiles on chromeos these days.

Part 2 moves a subset of //ash/common into //ash. The CQ cannot move
all the files at once, see https://codereview.chromium.org/2734653002/

BUG=690096
TEST=compiles, ash_unittests
TBR=oshima@chromium.org

Review-Url: https://codereview.chromium.org/2734683002
Cr-Original-Commit-Position: refs/heads/master@{#454791}
Review-Url: https://codereview.chromium.org/2734753002 .
Cr-Commit-Position: refs/heads/master@{#454798}

ash/accelerators/accelerator_commands_aura.cc

@@ -4,10 +4,10 @@
 
 #include "ash/accelerators/accelerator_commands_aura.h"
 
+#include "ash/common/wm/window_state.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 "base/metrics/user_metrics.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/manager/managed_display_info.h"

ash/accelerators/accelerator_commands_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/accelerators/accelerator_commands.h"
+#include "ash/common/accelerators/accelerator_commands.h"
 
 #include <memory>
 
 #include "ash/accelerators/accelerator_commands_aura.h"
+#include "ash/common/wm/window_state.h"
 #include "ash/test/ash_test_base.h"
-#include "ash/wm/window_state.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/window.h"

ash/accelerators/accelerator_controller_delegate_aura.cc

@@ -10,10 +10,14 @@
 #include <utility>
 
 #include "ash/accelerators/accelerator_commands_aura.h"
-#include "ash/accelerators/debug_commands.h"
+#include "ash/common/accelerators/debug_commands.h"
 #include "ash/common/accessibility_types.h"
 #include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shell_delegate.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
 #include "ash/common/wm_shell.h"
 #include "ash/debug.h"
 #include "ash/display/display_configuration_controller.h"
@@ -24,18 +28,14 @@
 #include "ash/root_window_controller.h"
 #include "ash/rotator/window_rotation.h"
 #include "ash/screenshot_delegate.h"
-#include "ash/shelf/wm_shelf.h"
 #include "ash/shell.h"
 #include "ash/system/system_notifier.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/touch/touch_hud_debug.h"
 #include "ash/utility/screenshot_controller.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/wm/power_button_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 "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics.h"

ash/accelerators/accelerator_controller_delegate_aura.h

@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include "ash/accelerators/accelerator_controller_delegate.h"
+#include "ash/common/accelerators/accelerator_controller_delegate.h"
 #include "base/macros.h"
 
 namespace ash {

ash/accelerators/accelerator_controller_unittest.cc

@@ -2,14 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
 
-#include "ash/accelerators/accelerator_table.h"
+#include "ash/common/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/test/test_shelf_delegate.h"
+#include "ash/common/wm/panels/panel_layout_manager.h"
+#include "ash/common/wm/window_positioning_utils.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
@@ -21,14 +26,9 @@
 #include "ash/test/lock_state_controller_test_api.h"
 #include "ash/test/test_screenshot_delegate.h"
 #include "ash/test/test_session_state_animator.h"
-#include "ash/test/test_shelf_delegate.h"
 #include "ash/wm/lock_state_controller.h"
-#include "ash/wm/panels/panel_layout_manager.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_util.h"
-#include "ash/wm/wm_event.h"
 #include "base/command_line.h"
 #include "base/test/user_action_tester.cc"
 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"

ash/accelerators/accelerator_delegate.cc

@@ -4,7 +4,7 @@
 
 #include "ash/accelerators/accelerator_delegate.h"
 
-#include "ash/accelerators/accelerator_router.h"
+#include "ash/common/accelerators/accelerator_router.h"
 #include "ash/common/wm_window.h"
 #include "ui/aura/window.h"
 #include "ui/events/event.h"

ash/accelerators/accelerator_filter_unittest.cc

@@ -6,16 +6,16 @@
 
 #include <memory>
 
-#include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_delegate.h"
+#include "ash/common/accelerators/accelerator_controller.h"
+#include "ash/common/test/test_session_state_delegate.h"
+#include "ash/common/wm/window_state.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"
 #include "ash/test/ash_test_helper.h"
 #include "ash/test/test_screenshot_delegate.h"
-#include "ash/test/test_session_state_delegate.h"
-#include "ash/wm/window_state.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "testing/gtest/include/gtest/gtest.h"

ash/accelerators/accelerator_interactive_uitest_chromeos.cc

@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
 
 #include "ash/common/shell_observer.h"
+#include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/system/network/network_observer.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/test/ash_interactive_ui_test_base.h"
 #include "ash/test/test_screenshot_delegate.h"
-#include "ash/wm/window_state.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/run_loop.h"

ash/app_list/app_list_delegate_impl.cc

@@ -4,11 +4,11 @@
 
 #include "ash/app_list/app_list_delegate_impl.h"
 
+#include "ash/common/shelf/app_list_button.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.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 "ui/app_list/presenter/app_list.h"
 
 namespace ash {

ash/app_list/app_list_presenter_delegate.cc

@@ -5,20 +5,20 @@
 #include "ash/app_list/app_list_presenter_delegate.h"
 
 #include "ash/common/ash_switches.h"
+#include "ash/common/shelf/app_list_button.h"
+#include "ash/common/shelf/shelf_layout_manager.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
+#include "ash/common/wm/wm_screen_util.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
-#include "ash/shelf/app_list_button.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/wm/maximize_mode/maximize_mode_controller.h"
-#include "ash/wm/wm_screen_util.h"
 #include "base/command_line.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_switches.h"

ash/app_list/app_list_presenter_delegate.h

@@ -8,8 +8,8 @@
 #include <stdint.h>
 
 #include "ash/ash_export.h"
+#include "ash/common/shelf/wm_shelf_observer.h"
 #include "ash/common/shell_observer.h"
-#include "ash/shelf/wm_shelf_observer.h"
 #include "base/macros.h"
 #include "ui/app_list/presenter/app_list_presenter_delegate.h"
 #include "ui/events/event_handler.h"

ash/aura/wm_shell_aura.cc

@@ -11,6 +11,9 @@
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/shell_observer.h"
+#include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
+#include "ash/common/wm/mru_window_tracker.h"
+#include "ash/common/wm/overview/window_selector_controller.h"
 #include "ash/common/wm_activation_observer.h"
 #include "ash/common/wm_display_observer.h"
 #include "ash/common/wm_window.h"
@@ -25,9 +28,6 @@
 #include "ash/virtual_keyboard_controller.h"
 #include "ash/wm/drag_window_resizer.h"
 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h"
-#include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
-#include "ash/wm/mru_window_tracker.h"
-#include "ash/wm/overview/window_selector_controller.h"
 #include "ash/wm/screen_pinning_controller.h"
 #include "ash/wm/window_cycle_event_filter_aura.h"
 #include "ash/wm/window_util.h"

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/root_window_finder.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 "base/timer/timer.h"
 #include "ui/aura/window_observer.h"
 #include "ui/aura/window_tree_host.h"

ash/accelerators/accelerator_commands.cc → ash/common/accelerators/accelerator_commands.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/accelerators/accelerator_commands.h"
+#include "ash/common/accelerators/accelerator_commands.h"
 
+#include "ash/common/wm/mru_window_tracker.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.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 "base/metrics/user_metrics.h"
 
 namespace ash {

ash/accelerators/accelerator_commands.h → ash/common/accelerators/accelerator_commands.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_ACCELERATORS_ACCELERATOR_COMMANDS_H_
-#define ASH_ACCELERATORS_ACCELERATOR_COMMANDS_H_
+#ifndef ASH_COMMON_ACCELERATORS_ACCELERATOR_COMMANDS_H_
+#define ASH_COMMON_ACCELERATORS_ACCELERATOR_COMMANDS_H_
 
 #include "ash/ash_export.h"
 
@@ -28,4 +28,4 @@ ASH_EXPORT void ToggleFullscreen();
 }  // namespace accelerators
 }  // namespace ash
 
-#endif  // ASH_ACCELERATORS_ACCELERATOR_COMMANDS_H_
+#endif  // ASH_COMMON_ACCELERATORS_ACCELERATOR_COMMANDS_H_

ash/accelerators/accelerator_controller.cc → ash/common/accelerators/accelerator_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/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
 
 #include <utility>
 
-#include "ash/accelerators/accelerator_commands.h"
-#include "ash/accelerators/accelerator_controller_delegate.h"
-#include "ash/accelerators/debug_commands.h"
+#include "ash/common/accelerators/accelerator_commands.h"
+#include "ash/common/accelerators/accelerator_controller_delegate.h"
+#include "ash/common/accelerators/debug_commands.h"
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/accessibility_types.h"
 #include "ash/common/focus_cycler.h"
@@ -18,13 +18,19 @@
 #include "ash/common/new_window_controller.h"
 #include "ash/common/palette_delegate.h"
 #include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shell_delegate.h"
+#include "ash/common/wm/mru_window_tracker.h"
+#include "ash/common/wm/overview/window_selector_controller.h"
+#include "ash/common/wm/window_cycle_controller.h"
+#include "ash/common/wm/window_positioning_utils.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/system/brightness_control_delegate.h"
 #include "ash/system/ime_menu/ime_menu_tray.h"
@@ -36,12 +42,6 @@
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/system/web_notification/web_notification_tray.h"
-#include "ash/wm/mru_window_tracker.h"
-#include "ash/wm/overview/window_selector_controller.h"
-#include "ash/wm/window_cycle_controller.h"
-#include "ash/wm/window_positioning_utils.h"
-#include "ash/wm/window_state.h"
-#include "ash/wm/wm_event.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics.h"
 #include "chromeos/dbus/dbus_thread_manager.h"

ash/accelerators/accelerator_controller.h → ash/common/accelerators/accelerator_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_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
-#define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
+#ifndef ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
+#define ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
 
 #include <stddef.h>
 
@@ -12,9 +12,9 @@
 #include <set>
 #include <vector>
 
-#include "ash/accelerators/accelerator_table.h"
-#include "ash/accelerators/exit_warning_handler.h"
 #include "ash/ash_export.h"
+#include "ash/common/accelerators/accelerator_table.h"
+#include "ash/common/accelerators/exit_warning_handler.h"
 #include "ash/public/interfaces/accelerator_controller.mojom.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
@@ -231,4 +231,4 @@ class ASH_EXPORT AcceleratorController
 
 }  // namespace ash
 
-#endif  // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
+#endif  // ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_H_

ash/accelerators/accelerator_controller_delegate.h → ash/common/accelerators/accelerator_controller_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_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
-#define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
+#ifndef ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
+#define ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
 
-#include "ash/accelerators/accelerator_table.h"
 #include "ash/ash_export.h"
+#include "ash/common/accelerators/accelerator_table.h"
 
 namespace ui {
 class Accelerator;
@@ -47,4 +47,4 @@ class ASH_EXPORT AcceleratorControllerDelegate {
 
 }  // namespace ash
 
-#endif  // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
+#endif  // ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_

ash/accelerators/accelerator_router.cc → ash/common/accelerators/accelerator_router.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/accelerators/accelerator_router.h"
+#include "ash/common/accelerators/accelerator_router.h"
 
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
+#include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
-#include "ash/wm/window_state.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/stl_util.h"
 #include "ui/base/accelerators/accelerator.h"