mash: Move several chromeos system tray items to //ash/common

* //ash/system/chromeos/bluetooth
* //ash/system/chromeos/enterprise
* //ash/system/chromeos/supervised
* //ash/system/chromeos/tray_caps_lock.*

Purely mechanical, no functional changes.

BUG=619636
TEST=ash_unittests

Review-Url: https://codereview.chromium.org/2108403004
Cr-Commit-Position: refs/heads/master@{#403388}

ash/ash.gyp

@@ -117,10 +117,16 @@
       'common/system/chromeos/audio/tray_audio_chromeos.h',
       'common/system/chromeos/audio/tray_audio_delegate_chromeos.cc',
       'common/system/chromeos/audio/tray_audio_delegate_chromeos.h',
+      'common/system/chromeos/bluetooth/bluetooth_notification_controller.cc',
+      'common/system/chromeos/bluetooth/bluetooth_notification_controller.h',
       'common/system/chromeos/bluetooth/bluetooth_observer.h',
+      'common/system/chromeos/bluetooth/tray_bluetooth.cc',
+      'common/system/chromeos/bluetooth/tray_bluetooth.h',
       'common/system/chromeos/devicetype_utils.cc',
       'common/system/chromeos/devicetype_utils.h',
       'common/system/chromeos/enterprise/enterprise_domain_observer.h',
+      'common/system/chromeos/enterprise/tray_enterprise.cc',
+      'common/system/chromeos/enterprise/tray_enterprise.h',
       'common/system/chromeos/media_security/media_capture_observer.h',
       'common/system/chromeos/network/network_detailed_view.h',
       'common/system/chromeos/network/network_observer.h',
@@ -171,8 +177,13 @@
       'common/system/chromeos/settings/tray_settings.cc',
       'common/system/chromeos/settings/tray_settings.h',
       'common/system/chromeos/shutdown_policy_observer.h',
+      'common/system/chromeos/supervised/custodian_info_tray_observer.h',
+      'common/system/chromeos/supervised/tray_supervised_user.cc',
+      'common/system/chromeos/supervised/tray_supervised_user.h',
       'common/system/chromeos/system_clock_observer.cc',
       'common/system/chromeos/system_clock_observer.h',
+      'common/system/chromeos/tray_caps_lock.cc',
+      'common/system/chromeos/tray_caps_lock.h',
       'common/system/chromeos/tray_tracing.cc',
       'common/system/chromeos/tray_tracing.h',
       'common/system/chromeos/virtual_keyboard/virtual_keyboard_observer.h',
@@ -591,16 +602,10 @@
       'sticky_keys/sticky_keys_overlay.h',
       'sticky_keys/sticky_keys_state.h',
       'system/brightness_control_delegate.h',
-      'system/chromeos/bluetooth/bluetooth_notification_controller.cc',
-      'system/chromeos/bluetooth/bluetooth_notification_controller.h',
-      'system/chromeos/bluetooth/tray_bluetooth.cc',
-      'system/chromeos/bluetooth/tray_bluetooth.h',
       'system/chromeos/brightness/brightness_controller_chromeos.cc',
       'system/chromeos/brightness/brightness_controller_chromeos.h',
       'system/chromeos/brightness/tray_brightness.cc',
       'system/chromeos/brightness/tray_brightness.h',
-      'system/chromeos/enterprise/tray_enterprise.cc',
-      'system/chromeos/enterprise/tray_enterprise.h',
       'system/chromeos/keyboard_brightness_controller.cc',
       'system/chromeos/keyboard_brightness_controller.h',
       'system/chromeos/media_security/multi_profile_media_tray_item.cc',
@@ -613,11 +618,6 @@
       'system/chromeos/power/video_activity_notifier.h',
       'system/chromeos/rotation/tray_rotation_lock.cc',
       'system/chromeos/rotation/tray_rotation_lock.h',
-      'system/chromeos/supervised/custodian_info_tray_observer.h',
-      'system/chromeos/supervised/tray_supervised_user.cc',
-      'system/chromeos/supervised/tray_supervised_user.h',
-      'system/chromeos/tray_caps_lock.cc',
-      'system/chromeos/tray_caps_lock.h',
       'system/chromeos/tray_display.cc',
       'system/chromeos/tray_display.h',
       'system/keyboard_brightness/keyboard_brightness_control_delegate.h',
@@ -904,6 +904,7 @@
       'common/system/chromeos/screen_security/screen_tray_item_unittest.cc',
       'common/system/chromeos/session/logout_confirmation_controller_unittest.cc',
       'common/system/chromeos/session/tray_session_length_limit_unittest.cc',
+      'common/system/chromeos/supervised/tray_supervised_user_unittest.cc',
       'common/system/date/date_view_unittest.cc',
       'common/system/ime/tray_ime_chromeos_unittest.cc',
       'common/system/tray/tray_details_view_unittest.cc',
@@ -966,7 +967,6 @@
       'system/chromeos/multi_user/user_switch_util_unittest.cc',
       'system/chromeos/power/power_event_observer_unittest.cc',
       'system/chromeos/rotation/tray_rotation_lock_unittest.cc',
-      'system/chromeos/supervised/tray_supervised_user_unittest.cc',
       'system/chromeos/tray_display_unittest.cc',
       'system/overview/overview_button_tray_unittest.cc',
       'system/toast/toast_manager_unittest.cc',

ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc → ash/common/system/chromeos/bluetooth/bluetooth_notification_controller.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/system/chromeos/bluetooth/bluetooth_notification_controller.h"
+#include "ash/common/system/chromeos/bluetooth/bluetooth_notification_controller.h"
 
 #include <memory>
 #include <utility>

ash/system/chromeos/bluetooth/bluetooth_notification_controller.h → ash/common/system/chromeos/bluetooth/bluetooth_notification_controller.h

@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SYSTEM_CHROMEOS_BLUETOOTH_BLUETOOTH_NOTIFICATION_CONTROLLER_H_
-#define ASH_SYSTEM_CHROMEOS_BLUETOOTH_BLUETOOTH_NOTIFICATION_CONTROLLER_H_
+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_BLUETOOTH_BLUETOOTH_NOTIFICATION_CONTROLLER_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_BLUETOOTH_BLUETOOTH_NOTIFICATION_CONTROLLER_H_
 
 #include <stdint.h>
 
 #include <set>
+#include <string>
 
 #include "ash/ash_export.h"
-#include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
@@ -91,4 +91,4 @@ class ASH_EXPORT BluetoothNotificationController
 
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_CHROMEOS_BLUETOOTH_BLUETOOTH_NOTIFICATION_CONTROLLER_H_
+#endif  // ASH_COMMON_SYSTEM_CHROMEOS_BLUETOOTH_BLUETOOTH_NOTIFICATION_CONTROLLER_H_

ash/system/chromeos/bluetooth/tray_bluetooth.cc → ash/common/system/chromeos/bluetooth/tray_bluetooth.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/system/chromeos/bluetooth/tray_bluetooth.h"
+#include "ash/common/system/chromeos/bluetooth/tray_bluetooth.h"
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/fixed_sized_scroll_view.h"

ash/system/chromeos/bluetooth/tray_bluetooth.h → ash/common/system/chromeos/bluetooth/tray_bluetooth.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_SYSTEM_CHROMEOS_BLUETOOTH_TRAY_BLUETOOTH_H_
-#define ASH_SYSTEM_CHROMEOS_BLUETOOTH_TRAY_BLUETOOTH_H_
+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_BLUETOOTH_TRAY_BLUETOOTH_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_BLUETOOTH_TRAY_BLUETOOTH_H_
 
 #include "ash/common/system/chromeos/bluetooth/bluetooth_observer.h"
 #include "ash/common/system/tray/system_tray_item.h"
@@ -42,4 +42,4 @@ class TrayBluetooth : public SystemTrayItem, public BluetoothObserver {
 
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_CHROMEOS_BLUETOOTH_TRAY_BLUETOOTH_H_
+#endif  // ASH_COMMON_SYSTEM_CHROMEOS_BLUETOOTH_TRAY_BLUETOOTH_H_

ash/system/chromeos/enterprise/tray_enterprise.cc → ash/common/system/chromeos/enterprise/tray_enterprise.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/system/chromeos/enterprise/tray_enterprise.h"
+#include "ash/common/system/chromeos/enterprise/tray_enterprise.h"
 
 #include "ash/common/login_status.h"
 #include "ash/common/system/tray/label_tray_view.h"

ash/system/chromeos/enterprise/tray_enterprise.h → ash/common/system/chromeos/enterprise/tray_enterprise.h

@@ -2,18 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SYSTEM_CHROMEOS_ENTERPRISE_TRAY_ENTERPRISE_H
-#define ASH_SYSTEM_CHROMEOS_ENTERPRISE_TRAY_ENTERPRISE_H
+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_ENTERPRISE_TRAY_ENTERPRISE_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_ENTERPRISE_TRAY_ENTERPRISE_H_
 
 #include "ash/common/system/chromeos/enterprise/enterprise_domain_observer.h"
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/system/tray/view_click_listener.h"
 #include "base/macros.h"
 
-namespace views {
-class View;
-}
-
 namespace ash {
 class LabelTrayView;
 class SystemTray;
@@ -47,4 +43,4 @@ class TrayEnterprise : public SystemTrayItem,
 
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_CHROMEOS_ENTERPRISE_TRAY_ENTERPRISE_H
+#endif  // ASH_COMMON_SYSTEM_CHROMEOS_ENTERPRISE_TRAY_ENTERPRISE_H_

ash/system/chromeos/supervised/custodian_info_tray_observer.h → ash/common/system/chromeos/supervised/custodian_info_tray_observer.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_SYSTEM_CHROMEOS_SUPERVISED_CUSTODIAN_INFO_TRAY_OBSERVER_H_
-#define ASH_SYSTEM_CHROMEOS_SUPERVISED_CUSTODIAN_INFO_TRAY_OBSERVER_H_
+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_SUPERVISED_CUSTODIAN_INFO_TRAY_OBSERVER_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_SUPERVISED_CUSTODIAN_INFO_TRAY_OBSERVER_H_
 
 namespace ash {
 
@@ -20,4 +20,4 @@ class CustodianInfoTrayObserver {
 
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_CHROMEOS_SUPERVISED_CUSTODIAN_INFO_TRAY_OBSERVER_H_
+#endif  // ASH_COMMON_SYSTEM_CHROMEOS_SUPERVISED_CUSTODIAN_INFO_TRAY_OBSERVER_H_

ash/system/chromeos/supervised/tray_supervised_user.cc → ash/common/system/chromeos/supervised/tray_supervised_user.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/system/chromeos/supervised/tray_supervised_user.h"
+#include "ash/common/system/chromeos/supervised/tray_supervised_user.h"
 
 #include <utility>
 

ash/system/chromeos/supervised/tray_supervised_user.h → ash/common/system/chromeos/supervised/tray_supervised_user.h

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SYSTEM_CHROMEOS_SUPERVISED_TRAY_SUPERVISED_USER_H
-#define ASH_SYSTEM_CHROMEOS_SUPERVISED_TRAY_SUPERVISED_USER_H
+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_SUPERVISED_TRAY_SUPERVISED_USER_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_SUPERVISED_TRAY_SUPERVISED_USER_H_
 
 #include "ash/ash_export.h"
+#include "ash/common/system/chromeos/supervised/custodian_info_tray_observer.h"
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/system/tray/view_click_listener.h"
-#include "ash/system/chromeos/supervised/custodian_info_tray_observer.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
 
@@ -62,4 +62,4 @@ class ASH_EXPORT TraySupervisedUser : public SystemTrayItem,
 
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_CHROMEOS_SUPERVISED_TRAY_SUPERVISED_USER_H
+#endif  // ASH_COMMON_SYSTEM_CHROMEOS_SUPERVISED_TRAY_SUPERVISED_USER_H_

ash/system/chromeos/supervised/tray_supervised_user_unittest.cc → ash/common/system/chromeos/supervised/tray_supervised_user_unittest.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/system/chromeos/supervised/tray_supervised_user.h"
+#include "ash/common/system/chromeos/supervised/tray_supervised_user.h"
 
 #include "ash/common/login_status.h"
 #include "ash/test/ash_test_base.h"

ash/system/chromeos/tray_caps_lock.cc → ash/common/system/chromeos/tray_caps_lock.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/system/chromeos/tray_caps_lock.h"
+#include "ash/common/system/chromeos/tray_caps_lock.h"
 
 #include "ash/common/system/tray/actionable_view.h"
 #include "ash/common/system/tray/fixed_sized_image_view.h"

ash/system/chromeos/tray_caps_lock.h → ash/common/system/chromeos/tray_caps_lock.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_SYSTEM_CHROMEOS_TRAY_CAPS_LOCK_H_
-#define ASH_SYSTEM_CHROMEOS_TRAY_CAPS_LOCK_H_
+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_TRAY_CAPS_LOCK_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_TRAY_CAPS_LOCK_H_
 
 #include "ash/common/system/tray/tray_image_item.h"
 #include "base/macros.h"
@@ -46,4 +46,4 @@ class TrayCapsLock : public TrayImageItem,
 
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_CHROMEOS_TRAY_CAPS_LOCK_H_
+#endif  // ASH_COMMON_SYSTEM_CHROMEOS_TRAY_CAPS_LOCK_H_

ash/shell.cc

@@ -125,6 +125,7 @@
 #include "ash/accelerators/magnifier_key_scroller.h"
 #include "ash/accelerators/spoken_feedback_toggler.h"
 #include "ash/common/ash_constants.h"
+#include "ash/common/system/chromeos/bluetooth/bluetooth_notification_controller.h"
 #include "ash/common/system/chromeos/power/power_status.h"
 #include "ash/display/display_change_observer_chromeos.h"
 #include "ash/display/display_color_manager_chromeos.h"
@@ -133,7 +134,6 @@
 #include "ash/display/resolution_notification_controller.h"
 #include "ash/display/screen_orientation_controller_chromeos.h"
 #include "ash/sticky_keys/sticky_keys_controller.h"
-#include "ash/system/chromeos/bluetooth/bluetooth_notification_controller.h"
 #include "ash/system/chromeos/brightness/brightness_controller_chromeos.h"
 #include "ash/system/chromeos/power/power_event_observer.h"
 #include "ash/system/chromeos/power/video_activity_notifier.h"

ash/system/tray/system_tray.cc

@@ -45,6 +45,8 @@
 
 #if defined(OS_CHROMEOS)
 #include "ash/common/system/chromeos/audio/tray_audio_chromeos.h"
+#include "ash/common/system/chromeos/bluetooth/tray_bluetooth.h"
+#include "ash/common/system/chromeos/enterprise/tray_enterprise.h"
 #include "ash/common/system/chromeos/network/tray_network.h"
 #include "ash/common/system/chromeos/network/tray_sms.h"
 #include "ash/common/system/chromeos/network/tray_vpn.h"
@@ -54,15 +56,13 @@
 #include "ash/common/system/chromeos/screen_security/screen_share_tray_item.h"
 #include "ash/common/system/chromeos/session/tray_session_length_limit.h"
 #include "ash/common/system/chromeos/settings/tray_settings.h"
+#include "ash/common/system/chromeos/supervised/tray_supervised_user.h"
+#include "ash/common/system/chromeos/tray_caps_lock.h"
 #include "ash/common/system/chromeos/tray_tracing.h"
 #include "ash/common/system/ime/tray_ime_chromeos.h"
-#include "ash/system/chromeos/bluetooth/tray_bluetooth.h"
 #include "ash/system/chromeos/brightness/tray_brightness.h"
-#include "ash/system/chromeos/enterprise/tray_enterprise.h"
 #include "ash/system/chromeos/media_security/multi_profile_media_tray_item.h"
 #include "ash/system/chromeos/rotation/tray_rotation_lock.h"
-#include "ash/system/chromeos/supervised/tray_supervised_user.h"
-#include "ash/system/chromeos/tray_caps_lock.h"
 #include "ash/system/chromeos/tray_display.h"
 #include "ui/message_center/message_center.h"
 #endif

chrome/browser/ui/ash/system_tray_delegate_chromeos.h

@@ -12,8 +12,8 @@
 
 #include "ash/common/accessibility_types.h"
 #include "ash/common/session/session_state_observer.h"
+#include "ash/common/system/chromeos/supervised/custodian_info_tray_observer.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
-#include "ash/system/chromeos/supervised/custodian_info_tray_observer.h"
 #include "ash/system/tray/system_tray.h"
 #include "base/callback_forward.h"
 #include "base/callback_list.h"