Commit 654b40da authored by jamescook's avatar jamescook Committed by Commit bot

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

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

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

BUG=690096
TEST=compiles, ash_unittests
TBR=oshima@chromium.org
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2729363002
Cr-Commit-Position: refs/heads/master@{#454793}
parent ab5da803
......@@ -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': {
......
This diff is collapsed.
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",
......
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.
......@@ -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 {
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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 {
......
......@@ -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"
......
......@@ -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 @@ class ASH_EXPORT AccessibilityDelegate {
} // namespace ash
#endif // ASH_COMMON_ACCESSIBILITY_DELEGATE_H_
#endif // ASH_ACCESSIBILITY_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_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 @@ const float kMagnificationScaleFactor = 1.18920712f;
} // namespace ash
#endif // ASH_COMMON_ACCESSIBILITY_TYPES_H_
#endif // ASH_ACCESSIBILITY_TYPES_H_
......@@ -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 {
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"