chromeos: Move files in //ash/common/system/chromeos to //ash/system
Ash only compiles on chromeos so there's no need for special /chromeos
subdirectories. We're also getting rid of //ash/common, so just move
everything into //ash/system.
Mechanical file moves:
* //ash/system/chromeos -> //ash/system
* //ash/common/system/chromeos -> //ash/system
Also fix some bad include guards.
This is a mechnical move with tools/git/mass-rename.py. No behavior
changes.
BUG=666778
TEST=compiles, ash_unittests
[email protected]
Change-Id: I572565f83fe7a8c63e58693afd92f454b9ac8bb0
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation
Change-Id: I572565f83fe7a8c63e58693afd92f454b9ac8bb0
Reviewed-on: https://chromium-review.googlesource.com/471884
Commit-Queue: James Cook <[email protected]>
Reviewed-by: James Cook <[email protected]>
Cr-Commit-Position: refs/heads/master@{#463121}diff --git a/ash/shell.cc b/ash/shell.cc
index e9718cf..5768e5e 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -40,14 +40,6 @@
#include "ash/common/shell_observer.h"
#include "ash/common/shutdown_controller.h"
#include "ash/common/system/brightness_control_delegate.h"
-#include "ash/common/system/chromeos/bluetooth/bluetooth_notification_controller.h"
-#include "ash/common/system/chromeos/bluetooth/tray_bluetooth_helper.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/sms_observer.h"
-#include "ash/common/system/chromeos/network/vpn_list.h"
-#include "ash/common/system/chromeos/power/power_status.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/status_area_widget.h"
@@ -95,9 +87,17 @@
#include "ash/root_window_controller.h"
#include "ash/shell_init_params.h"
#include "ash/sticky_keys/sticky_keys_controller.h"
-#include "ash/system/chromeos/power/power_event_observer.h"
-#include "ash/system/chromeos/power/video_activity_notifier.h"
-#include "ash/system/chromeos/screen_layout_observer.h"
+#include "ash/system/bluetooth/bluetooth_notification_controller.h"
+#include "ash/system/bluetooth/tray_bluetooth_helper.h"
+#include "ash/system/brightness/brightness_controller_chromeos.h"
+#include "ash/system/keyboard_brightness_controller.h"
+#include "ash/system/network/sms_observer.h"
+#include "ash/system/network/vpn_list.h"
+#include "ash/system/power/power_event_observer.h"
+#include "ash/system/power/power_status.h"
+#include "ash/system/power/video_activity_notifier.h"
+#include "ash/system/screen_layout_observer.h"
+#include "ash/system/session/logout_confirmation_controller.h"
#include "ash/touch/ash_touch_transform_controller.h"
#include "ash/utility/screenshot_controller.h"
#include "ash/virtual_keyboard_controller.h"
