Skip to content

Commit

Permalink
chromeos: Move files in //ash/common to //ash, part 1
Browse files Browse the repository at this point in the history 
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 1 moves //ash/common/system into //ash/system. The CQ cannot handle
moving all 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/2732813002
Cr-Commit-Position: refs/heads/master@{#454786}
  • Loading branch information
jamescook authored and Commit bot committed Mar 5, 2017
1 parent 0832734 commit a0c4422
Show file tree
Hide file tree
Showing 449 changed files with 1,795 additions and 1,804 deletions.
596 changes: 298 additions & 298 deletions ash/BUILD.gn
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ash/accelerators/accelerator_controller_delegate_aura.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/shell_delegate.h"
#include "ash/common/system/system_notifier.h"
#include "ash/common/system/tray/system_tray.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"
Expand All @@ -31,6 +29,8 @@
#include "ash/rotator/window_rotation.h"
#include "ash/screenshot_delegate.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/power_button_controller.h"
Expand Down
6 changes: 3 additions & 3 deletions ash/accelerators/accelerator_controller_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
#include "ash/common/ash_switches.h"
#include "ash/common/ime_control_delegate.h"
#include "ash/common/session/session_state_delegate.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"
Expand All @@ -22,6 +19,9 @@
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.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"
Expand Down
6 changes: 3 additions & 3 deletions ash/accelerators/accelerator_interactive_uitest_chromeos.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
#include "ash/common/accelerators/accelerator_controller.h"

#include "ash/common/shell_observer.h"
#include "ash/common/system/chromeos/network/network_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/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_aura.h"
Expand Down
2 changes: 1 addition & 1 deletion ash/ash_touch_exploration_manager_chromeos.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
#include "ash/ash_touch_exploration_manager_chromeos.h"

#include "ash/common/accessibility_delegate.h"
#include "ash/common/system/tray/system_tray_notifier.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.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 "base/command_line.h"
#include "base/memory/ptr_util.h"
Expand Down
2 changes: 1 addition & 1 deletion ash/ash_touch_exploration_manager_chromeos.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <memory>

#include "ash/ash_export.h"
#include "ash/common/system/accessibility_observer.h"
#include "ash/system/accessibility_observer.h"
#include "base/macros.h"
#include "ui/chromeos/touch_accessibility_enabler.h"
#include "ui/chromeos/touch_exploration_controller.h"
Expand Down
20 changes: 10 additions & 10 deletions ash/common/accelerators/accelerator_controller.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,6 @@
#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/chromeos/ime_menu/ime_menu_tray.h"
#include "ash/common/system/chromeos/palette/palette_tray.h"
#include "ash/common/system/chromeos/palette/palette_utils.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_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"
Expand All @@ -42,6 +32,16 @@
#include "ash/resources/vector_icons/vector_icons.h"
#include "ash/root_window_controller.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_delegate.h"
#include "ash/system/tray/system_tray_notifier.h"
#include "ash/system/web_notification/web_notification_tray.h"
#include "base/metrics/histogram_macros.h"
#include "base/metrics/user_metrics.h"
#include "chromeos/dbus/dbus_thread_manager.h"
Expand Down
4 changes: 2 additions & 2 deletions ash/common/accelerators/debug_commands.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
#include "ash/common/accelerators/accelerator_commands.h"
#include "ash/common/ash_switches.h"
#include "ash/common/shell_delegate.h"
#include "ash/common/system/toast/toast_data.h"
#include "ash/common/system/toast/toast_manager.h"
#include "ash/common/wallpaper/wallpaper_controller.h"
#include "ash/common/wallpaper/wallpaper_delegate.h"
#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/root_window_controller.h"
#include "ash/system/toast/toast_data.h"
#include "ash/system/toast/toast_manager.h"
#include "ash/wm/window_properties.h"
#include "base/command_line.h"
#include "base/metrics/user_metrics.h"
Expand Down
6 changes: 3 additions & 3 deletions ash/common/keyboard/keyboard_ui.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@

#include "ash/common/accessibility_delegate.h"
#include "ash/common/keyboard/keyboard_ui_observer.h"
#include "ash/common/system/accessibility_observer.h"
#include "ash/common/system/tray/system_tray_notifier.h"
#include "ash/common/system/tray_accessibility.h"
#include "ash/common/wm_shell.h"
#include "ash/system/accessibility_observer.h"
#include "ash/system/tray/system_tray_notifier.h"
#include "ash/system/tray_accessibility.h"
#include "base/memory/ptr_util.h"
#include "ui/keyboard/keyboard_controller.h"

Expand Down
6 changes: 3 additions & 3 deletions ash/common/mojo_interface_factory.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
#include "ash/common/shelf/shelf_controller.h"
#include "ash/common/shell_delegate.h"
#include "ash/common/shutdown_controller.h"
#include "ash/common/system/chromeos/network/vpn_list.h"
#include "ash/common/system/locale/locale_notification_controller.h"
#include "ash/common/system/tray/system_tray_controller.h"
#include "ash/common/wallpaper/wallpaper_controller.h"
#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.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 "base/bind.h"
#include "services/service_manager/public/cpp/interface_registry.h"
#include "ui/app_list/presenter/app_list.h"
Expand Down
2 changes: 1 addition & 1 deletion ash/common/shelf/app_list_button.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
#include "ash/common/shelf/shelf_constants.h"
#include "ash/common/shelf/shelf_view.h"
#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/system/tray/tray_popup_utils.h"
#include "ash/common/wm_shell.h"
#include "ash/public/cpp/shelf_types.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/system/tray/tray_popup_utils.h"
#include "base/memory/ptr_util.h"
#include "ui/accessibility/ax_node_data.h"
#include "ui/base/l10n/l10n_util.h"
Expand Down
2 changes: 1 addition & 1 deletion ash/common/shelf/overflow_bubble.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#include "ash/common/shelf/overflow_button.h"
#include "ash/common/shelf/shelf_view.h"
#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/system/tray/tray_background_view.h"
#include "ash/common/wm_shell.h"
#include "ash/system/tray/tray_background_view.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/views/widget/widget.h"

Expand Down
2 changes: 1 addition & 1 deletion ash/common/shelf/shelf_layout_manager.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include "ash/common/shelf/shelf_layout_manager_observer.h"
#include "ash/common/shelf/shelf_widget.h"
#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/system/status_area_widget.h"
#include "ash/common/wm/fullscreen_window_finder.h"
#include "ash/common/wm/mru_window_tracker.h"
#include "ash/common/wm/window_state.h"
Expand All @@ -24,6 +23,7 @@
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
#include "ash/system/status_area_widget.h"
#include "base/auto_reset.h"
#include "base/command_line.h"
#include "base/i18n/rtl.h"
Expand Down
2 changes: 1 addition & 1 deletion ash/common/shelf/shelf_tooltip_manager.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

#include "ash/common/shelf/shelf_view.h"
#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/system/tray/tray_constants.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/system/tray/tray_constants.h"
#include "base/bind.h"
#include "base/strings/string16.h"
#include "base/threading/thread_task_runner_handle.h"
Expand Down
4 changes: 2 additions & 2 deletions ash/common/shelf/shelf_widget.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
#include "ash/common/shelf/shelf_view.h"
#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/shelf/wm_shelf_util.h"
#include "ash/common/system/status_area_layout_manager.h"
#include "ash/common/system/status_area_widget.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/root_window_controller.h"
#include "ash/system/status_area_layout_manager.h"
#include "ash/system/status_area_widget.h"
#include "ash/wm/window_properties.h"
#include "base/memory/ptr_util.h"
#include "ui/compositor/layer.h"
Expand Down
2 changes: 1 addition & 1 deletion ash/common/shelf/wm_shelf.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
#include "ash/common/shelf/shelf_model.h"
#include "ash/common/shelf/shelf_widget.h"
#include "ash/common/shelf/wm_shelf_observer.h"
#include "ash/common/system/tray/system_tray_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/shelf/shelf_bezel_event_handler.h"
#include "ash/shell.h"
#include "ash/system/tray/system_tray_delegate.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "ui/aura/env.h"
Expand Down
1 change: 0 additions & 1 deletion ash/common/system/OWNERS
View file

This file was deleted.

3 changes: 0 additions & 3 deletions ash/common/system/chromeos/DEPS
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ash/common/test/ash_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
#include "ash/common/test/ash_test.h"

#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/system/status_area_widget.h"
#include "ash/common/test/ash_test_impl.h"
#include "ash/common/test/test_session_state_delegate.h"
#include "ash/common/test/test_system_tray_delegate.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/root_window_controller.h"
#include "ash/system/status_area_widget.h"
#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "ui/compositor/layer_type.h"
Expand Down
4 changes: 2 additions & 2 deletions ash/common/test/test_system_tray_delegate.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#ifndef ASH_COMMON_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_
#define ASH_COMMON_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_

#include "ash/common/system/tray/default_system_tray_delegate.h"
#include "ash/common/system/tray/ime_info.h"
#include "ash/system/tray/default_system_tray_delegate.h"
#include "ash/system/tray/ime_info.h"
#include "base/macros.h"
#include "base/time/time.h"

Expand Down
2 changes: 1 addition & 1 deletion ash/common/test/wm_shell_test_api.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

#include <utility>

#include "ash/common/system/tray/system_tray_delegate.h"
#include "ash/common/wm_shell.h"
#include "ash/public/interfaces/new_window.mojom.h"
#include "ash/system/tray/system_tray_delegate.h"

namespace ash {

Expand Down
2 changes: 1 addition & 1 deletion ash/common/wm/maximize_mode/maximize_mode_event_handler.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
#include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h"

#include "ash/common/session/session_state_delegate.h"
#include "ash/common/system/tray/system_tray_delegate.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/system/tray/system_tray_delegate.h"
#include "ui/events/event.h"

namespace ash {
Expand Down
2 changes: 1 addition & 1 deletion ash/common/wm/overview/window_selector_controller.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
#include <vector>

#include "ash/common/session/session_state_delegate.h"
#include "ash/common/system/tray/system_tray_delegate.h"
#include "ash/common/wm/mru_window_tracker.h"
#include "ash/common/wm/overview/window_selector.h"
#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/system/tray/system_tray_delegate.h"
#include "base/metrics/histogram_macros.h"

namespace ash {
Expand Down
22 changes: 11 additions & 11 deletions ash/common/wm_shell.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,6 @@
#include "ash/common/shelf/shelf_window_watcher.h"
#include "ash/common/shell_delegate.h"
#include "ash/common/shutdown_controller.h"
#include "ash/common/system/brightness_control_delegate.h"
#include "ash/common/system/chromeos/brightness/brightness_controller_chromeos.h"
#include "ash/common/system/chromeos/keyboard_brightness_controller.h"
#include "ash/common/system/chromeos/network/vpn_list.h"
#include "ash/common/system/chromeos/session/logout_confirmation_controller.h"
#include "ash/common/system/keyboard_brightness_control_delegate.h"
#include "ash/common/system/locale/locale_notification_controller.h"
#include "ash/common/system/toast/toast_manager.h"
#include "ash/common/system/tray/system_tray_controller.h"
#include "ash/common/system/tray/system_tray_delegate.h"
#include "ash/common/system/tray/system_tray_notifier.h"
#include "ash/common/wallpaper/wallpaper_controller.h"
#include "ash/common/wallpaper/wallpaper_delegate.h"
#include "ash/common/wm/immersive_context_ash.h"
Expand All @@ -51,6 +40,17 @@
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
#include "ash/shell.h"
#include "ash/system/brightness/brightness_controller_chromeos.h"
#include "ash/system/brightness_control_delegate.h"
#include "ash/system/keyboard_brightness_control_delegate.h"
#include "ash/system/keyboard_brightness_controller.h"
#include "ash/system/locale/locale_notification_controller.h"
#include "ash/system/network/vpn_list.h"
#include "ash/system/session/logout_confirmation_controller.h"
#include "ash/system/toast/toast_manager.h"
#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 "base/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
Expand Down
2 changes: 1 addition & 1 deletion ash/content/display/screen_orientation_controller_chromeos_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "ash/common/wm_shell.h"
#include "ash/content/shell_content_state.h"
#include "ash/shell.h"
#include "ash/system/chromeos/screen_layout_observer.h"
#include "ash/system/screen_layout_observer.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/ash_test_environment_content.h"
#include "ash/test/ash_test_helper.h"
Expand Down
2 changes: 1 addition & 1 deletion ash/display/display_error_observer_chromeos.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

#include "ash/display/display_error_observer_chromeos.h"

#include "ash/common/system/chromeos/devicetype_utils.h"
#include "ash/display/display_util.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/system/devicetype_utils.h"
#include "base/strings/string_number_conversions.h"
#include "ui/base/l10n/l10n_util.h"

Expand Down
2 changes: 1 addition & 1 deletion ash/display/display_error_observer_chromeos_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

#include "ash/display/display_error_observer_chromeos.h"

#include "ash/common/system/chromeos/devicetype_utils.h"
#include "ash/display/display_util.h"
#include "ash/shell.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/system/devicetype_utils.h"
#include "ash/test/ash_test_base.h"
#include "ui/aura/window.h"
#include "ui/base/l10n/l10n_util.h"
Expand Down
2 changes: 1 addition & 1 deletion ash/display/display_util.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include <utility>

#include "ash/common/new_window_controller.h"
#include "ash/common/system/system_notifier.h"
#include "ash/common/wm_shell.h"
#include "ash/display/extended_mouse_warp_controller.h"
#include "ash/display/null_mouse_warp_controller.h"
Expand All @@ -17,6 +16,7 @@
#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 "base/memory/ptr_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
Expand Down
Loading

0 comments on commit a0c4422

Please sign in to comment.