chromeos: Move //ash/common files into //ash

//ash contains the "Aura Shell" system UI used by Chrome OS. For the mustash servicification project we initially started moving files into //ash/mus vs. //ash/aura vs. //ash/common. This allowed us to use DEPS to ban aura includes. We now support aura on mus all the time, so we don't need this directory structure. BUG=690096 TEST=compiles, ash_unittests TBR=sky@chromium.org Change-Id: I682586877b6c537d2db613664318bbc0365362c6 CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation Change-Id: I682586877b6c537d2db613664318bbc0365362c6 Reviewed-on: https://chromium-review.googlesource.com/472548 Reviewed-by: James Cook <jamescook@chromium.org> Cr-Commit-Position: refs/heads/master@{#463140}
hylschwy · Apr 9, 2017 · b0bf8e8 · b0bf8e8
1 parent 1c4d759
commit b0bf8e8
Show file tree

Hide file tree

Showing 988 changed files with 4,020 additions and 4,042 deletions.
diff --git a/ash/BUILD.gn b/ash/BUILD.gn
diff --git a/...mmon/accelerators/accelerator_commands.cc → ash/accelerators/accelerator_commands.cc b/...mmon/accelerators/accelerator_commands.cc → ash/accelerators/accelerator_commands.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/accelerators/accelerator_commands.h"
+#include "ash/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_window.h"
 #include "ash/shell.h"
+#include "ash/wm/mru_window_tracker.h"
+#include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
+#include "ash/wm/wm_event.h"
+#include "ash/wm_window.h"
 #include "base/metrics/user_metrics.h"
 
 namespace ash {

diff --git a/...ommon/accelerators/accelerator_commands.h → ash/accelerators/accelerator_commands.h b/...ommon/accelerators/accelerator_commands.h → ash/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_COMMON_ACCELERATORS_ACCELERATOR_COMMANDS_H_
-#define ASH_COMMON_ACCELERATORS_ACCELERATOR_COMMANDS_H_
+#ifndef ASH_ACCELERATORS_ACCELERATOR_COMMANDS_H_
+#define ASH_ACCELERATORS_ACCELERATOR_COMMANDS_H_
 
 #include "ash/ash_export.h"
 
@@ -28,4 +28,4 @@ ASH_EXPORT void ToggleFullscreen();
 }  // namespace accelerators
 }  // namespace ash
 
-#endif  // ASH_COMMON_ACCELERATORS_ACCELERATOR_COMMANDS_H_
+#endif  // ASH_ACCELERATORS_ACCELERATOR_COMMANDS_H_
diff --git a/ash/accelerators/accelerator_commands_aura.cc b/ash/accelerators/accelerator_commands_aura.cc
@@ -4,10 +4,10 @@
 
 #include "ash/accelerators/accelerator_commands_aura.h"
 
-#include "ash/common/wm/window_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 "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_commands_unittest.cc b/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/common/accelerators/accelerator_commands.h"
+#include "ash/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"

diff --git a/...on/accelerators/accelerator_controller.cc → ash/accelerators/accelerator_controller.cc b/...on/accelerators/accelerator_controller.cc → ash/accelerators/accelerator_controller.cc
@@ -2,51 +2,51 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/common/accelerators/accelerator_controller.h"
+#include "ash/accelerators/accelerator_controller.h"
 
 #include <utility>
 
-#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"
-#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_controller.h"
-#include "ash/common/shelf/shelf_widget.h"
-#include "ash/common/shelf/wm_shelf.h"
-#include "ash/common/shell_delegate.h"
-#include "ash/common/system/brightness_control_delegate.h"
-#include "ash/common/system/keyboard_brightness_control_delegate.h"
-#include "ash/common/system/status_area_widget.h"
-#include "ash/common/system/system_notifier.h"
-#include "ash/common/system/tray/system_tray.h"
-#include "ash/common/system/tray/system_tray_delegate.h"
-#include "ash/common/system/tray/system_tray_notifier.h"
-#include "ash/common/system/web_notification/web_notification_tray.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/accelerators/accelerator_commands.h"
+#include "ash/accelerators/accelerator_controller_delegate.h"
+#include "ash/accelerators/debug_commands.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/rotator/window_rotation.h"
+#include "ash/session/session_controller.h"
+#include "ash/shelf/shelf_widget.h"
+#include "ash/shelf/wm_shelf.h"
 #include "ash/shell.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"
+#include "ash/system/keyboard_brightness_control_delegate.h"
 #include "ash/system/palette/palette_tray.h"
 #include "ash/system/palette/palette_utils.h"
+#include "ash/system/status_area_widget.h"
+#include "ash/system/system_notifier.h"
+#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/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/screen_pinning_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/window_util.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 "base/strings/string_split.h"

diff --git a/...mon/accelerators/accelerator_controller.h → ash/accelerators/accelerator_controller.h b/...mon/accelerators/accelerator_controller.h → ash/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_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
-#define ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
+#ifndef ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
+#define ASH_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"
@@ -234,4 +234,4 @@ class ASH_EXPORT AcceleratorController
 
 }  // namespace ash
 
-#endif  // ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
+#endif  // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
diff --git a/...erators/accelerator_controller_delegate.h → ...erators/accelerator_controller_delegate.h b/...erators/accelerator_controller_delegate.h → ...erators/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_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
-#define ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
+#ifndef ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
+#define ASH_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;
@@ -40,4 +40,4 @@ class ASH_EXPORT AcceleratorControllerDelegate {
 
 }  // namespace ash
 
-#endif  // ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
+#endif  // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
diff --git a/ash/accelerators/accelerator_controller_delegate_aura.cc b/ash/accelerators/accelerator_controller_delegate_aura.cc
@@ -10,26 +10,26 @@
 #include <utility>
 
 #include "ash/accelerators/accelerator_commands_aura.h"
-#include "ash/common/accelerators/debug_commands.h"
-#include "ash/common/accessibility_types.h"
-#include "ash/common/shelf/wm_shelf.h"
-#include "ash/common/system/system_notifier.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/accelerators/debug_commands.h"
+#include "ash/accessibility_types.h"
 #include "ash/debug.h"
 #include "ash/display/display_configuration_controller.h"
 #include "ash/host/ash_window_tree_host.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/screenshot_delegate.h"
+#include "ash/shelf/wm_shelf.h"
 #include "ash/shell.h"
+#include "ash/system/system_notifier.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/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_delegate_aura.h b/ash/accelerators/accelerator_controller_delegate_aura.h
@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include "ash/common/accelerators/accelerator_controller_delegate.h"
+#include "ash/accelerators/accelerator_controller_delegate.h"
 #include "base/macros.h"
 
 namespace ash {

diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
@@ -2,33 +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/accelerators/accelerator_controller.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_controller.h"
-#include "ash/common/system/brightness_control_delegate.h"
-#include "ash/common/system/keyboard_brightness_control_delegate.h"
-#include "ash/common/system/tray/system_tray_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/accelerators/accelerator_controller.h"
+
+#include "ash/accelerators/accelerator_table.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_controller.h"
 #include "ash/shell.h"
+#include "ash/system/brightness_control_delegate.h"
+#include "ash/system/keyboard_brightness_control_delegate.h"
+#include "ash/system/tray/system_tray_delegate.h"
 #include "ash/test/ash_test_base.h"
 #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 "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
@@ -4,8 +4,8 @@
 
 #include "ash/accelerators/accelerator_delegate.h"
 
-#include "ash/common/accelerators/accelerator_router.h"
-#include "ash/common/wm_window.h"
+#include "ash/accelerators/accelerator_router.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
@@ -6,18 +6,18 @@
 
 #include <memory>
 
+#include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_delegate.h"
-#include "ash/common/accelerators/accelerator_controller.h"
-#include "ash/common/session/session_controller.h"
-#include "ash/common/wm/window_state.h"
-#include "ash/common/wm_shell.h"
 #include "ash/public/cpp/shell_window_ids.h"
+#include "ash/session/session_controller.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/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
@@ -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/accelerators/accelerator_controller.h"
+#include "ash/accelerators/accelerator_controller.h"
 
-#include "ash/common/shell_observer.h"
-#include "ash/common/system/tray/system_tray_delegate.h"
-#include "ash/common/system/tray/system_tray_notifier.h"
-#include "ash/common/wm/window_state.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"
 #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"

diff --git a/...common/accelerators/accelerator_router.cc → ash/accelerators/accelerator_router.cc b/...common/accelerators/accelerator_router.cc → ash/accelerators/accelerator_router.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/accelerators/accelerator_router.h"
+#include "ash/accelerators/accelerator_router.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/accelerators/accelerator_controller.h"
 #include "ash/shell.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/common/accelerators/accelerator_router.h → ash/accelerators/accelerator_router.h b/ash/common/accelerators/accelerator_router.h → ash/accelerators/accelerator_router.h
diff --git a/ash/common/accelerators/accelerator_table.cc → ash/accelerators/accelerator_table.cc b/ash/common/accelerators/accelerator_table.cc → ash/accelerators/accelerator_table.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/accelerators/accelerator_table.h"
+#include "ash/accelerators/accelerator_table.h"
 
 #include "ash/strings/grit/ash_strings.h"
 #include "base/macros.h"

diff --git a/ash/common/accelerators/accelerator_table.h → ash/accelerators/accelerator_table.h b/ash/common/accelerators/accelerator_table.h → ash/accelerators/accelerator_table.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_ACCELERATORS_ACCELERATOR_TABLE_H_
-#define ASH_COMMON_ACCELERATORS_ACCELERATOR_TABLE_H_
+#ifndef ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
+#define ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
 
 #include <stddef.h>
 
@@ -261,4 +261,4 @@ ASH_EXPORT extern const size_t kActionsKeepingMenuOpenLength;
 
 }  // namespace ash
 
-#endif  // ASH_COMMON_ACCELERATORS_ACCELERATOR_TABLE_H_
+#endif  // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_