mash: Move tray settings and deps to common.
tools/git/move_source_file.py ash/system/chromeos/devicetype_utils* ash/common/system/chromeos/
tools/git/move_source_file.py ash/system/chromeos/power/battery_notification* ash/common/system/chromeos/power/
tools/git/move_source_file.py ash/system/chromeos/power/dual_role_notification* ash/common/system/chromeos/power/
tools/git/move_source_file.py ash/system/chromeos/power/power_status* ash/common/system/chromeos/power/
tools/git/move_source_file.py ash/system/chromeos/power/tray_power* ash/common/system/chromeos/power/
tools/git/move_source_file.py ash/system/chromeos/settings/tray_settings* ash/common/system/chromeos/settings/
tools/git/move_source_file.py ash/system/system_notifier* ash/common/system/
Add ash_switches.h to allowed ash/common/DEPS; run "git cl format".
Convert tray_settings.cc ash::Shell uses to ash::WmShell.
Remove some unused shell[_delegate].h includes.
BUG=619636
TEST=compiles, ash_unittests
[email protected],[email protected]
[email protected]
Review-Url: https://codereview.chromium.org/2072013002
Cr-Commit-Position: refs/heads/master@{#400448}
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index 23fa5d27..6b29ad4 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -16,6 +16,7 @@
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shelf/shelf_model.h"
#include "ash/common/shell_window_ids.h"
+#include "ash/common/system/system_notifier.h"
#include "ash/common/system/tray/system_tray_delegate.h"
#include "ash/common/system/volume_control_delegate.h"
#include "ash/common/wm/mru_window_tracker.h"
@@ -44,7 +45,6 @@
#include "ash/system/brightness_control_delegate.h"
#include "ash/system/keyboard_brightness/keyboard_brightness_control_delegate.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_notifier.h"
#include "ash/system/web_notification/web_notification_tray.h"
diff --git a/ash/ash.gyp b/ash/ash.gyp
index ec9a855..988ed0d 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -96,6 +96,20 @@
'common/shelf/wm_shelf_util.h',
'common/shell_window_ids.cc',
'common/shell_window_ids.h',
+ 'common/system/chromeos/devicetype_utils.cc',
+ 'common/system/chromeos/devicetype_utils.h',
+ 'common/system/chromeos/power/battery_notification.cc',
+ 'common/system/chromeos/power/battery_notification.h',
+ 'common/system/chromeos/power/dual_role_notification.cc',
+ 'common/system/chromeos/power/dual_role_notification.h',
+ 'common/system/chromeos/power/power_status.cc',
+ 'common/system/chromeos/power/power_status.h',
+ 'common/system/chromeos/power/power_status_view.cc',
+ 'common/system/chromeos/power/power_status_view.h',
+ 'common/system/chromeos/power/tray_power.cc',
+ 'common/system/chromeos/power/tray_power.h',
+ 'common/system/chromeos/settings/tray_settings.cc',
+ 'common/system/chromeos/settings/tray_settings.h',
'common/system/chromeos/shutdown_policy_observer.h',
'common/system/chromeos/system_clock_observer.cc',
'common/system/chromeos/system_clock_observer.h',
@@ -108,6 +122,8 @@
'common/system/date/tray_date.h',
'common/system/networking_config_delegate.cc',
'common/system/networking_config_delegate.h',
+ 'common/system/system_notifier.cc',
+ 'common/system/system_notifier.h',
'common/system/tray/actionable_view.cc',
'common/system/tray/actionable_view.h',
'common/system/tray/default_system_tray_delegate.cc',
@@ -486,8 +502,6 @@
'system/chromeos/brightness/brightness_controller_chromeos.h',
'system/chromeos/brightness/tray_brightness.cc',
'system/chromeos/brightness/tray_brightness.h',
- 'system/chromeos/devicetype_utils.cc',
- 'system/chromeos/devicetype_utils.h',
'system/chromeos/enterprise/enterprise_domain_observer.h',
'system/chromeos/enterprise/tray_enterprise.cc',
'system/chromeos/enterprise/tray_enterprise.h',
@@ -514,18 +528,8 @@
'system/chromeos/network/vpn_delegate.h',
'system/chromeos/network/vpn_list_view.cc',
'system/chromeos/network/vpn_list_view.h',
- 'system/chromeos/power/battery_notification.cc',
- 'system/chromeos/power/battery_notification.h',
- 'system/chromeos/power/dual_role_notification.cc',
- 'system/chromeos/power/dual_role_notification.h',
'system/chromeos/power/power_event_observer.cc',
'system/chromeos/power/power_event_observer.h',
- 'system/chromeos/power/power_status.cc',
- 'system/chromeos/power/power_status.h',
- 'system/chromeos/power/power_status_view.cc',
- 'system/chromeos/power/power_status_view.h',
- 'system/chromeos/power/tray_power.cc',
- 'system/chromeos/power/tray_power.h',
'system/chromeos/power/video_activity_notifier.cc',
'system/chromeos/power/video_activity_notifier.h',
'system/chromeos/rotation/tray_rotation_lock.cc',
@@ -551,8 +555,6 @@
'system/chromeos/session/session_length_limit_observer.h',
'system/chromeos/session/tray_session_length_limit.cc',
'system/chromeos/session/tray_session_length_limit.h',
- 'system/chromeos/settings/tray_settings.cc',
- 'system/chromeos/settings/tray_settings.h',
'system/chromeos/supervised/custodian_info_tray_observer.h',
'system/chromeos/supervised/tray_supervised_user.cc',
'system/chromeos/supervised/tray_supervised_user.h',
@@ -577,8 +579,6 @@
'system/status_area_widget.h',
'system/status_area_widget_delegate.cc',
'system/status_area_widget_delegate.h',
- 'system/system_notifier.cc',
- 'system/system_notifier.h',
'system/toast/toast_data.cc',
'system/toast/toast_data.h',
'system/toast/toast_manager.cc',
@@ -895,6 +895,9 @@
'autoclick/autoclick_unittest.cc',
'common/material_design/material_design_controller_unittest.cc',
'common/shelf/shelf_model_unittest.cc',
+ 'common/system/chromeos/power/power_status_unittest.cc',
+ 'common/system/chromeos/power/power_status_view_unittest.cc',
+ 'common/system/chromeos/power/tray_power_unittest.cc',
'common/system/date/date_view_unittest.cc',
'common/system/update/tray_update_unittest.cc',
'content/display/screen_orientation_controller_chromeos_unittest.cc',
@@ -954,9 +957,6 @@
'system/chromeos/brightness/tray_brightness_unittest.cc',
'system/chromeos/multi_user/user_switch_util_unittest.cc',
'system/chromeos/power/power_event_observer_unittest.cc',
- 'system/chromeos/power/power_status_unittest.cc',
- 'system/chromeos/power/power_status_view_unittest.cc',
- 'system/chromeos/power/tray_power_unittest.cc',
'system/chromeos/rotation/tray_rotation_lock_unittest.cc',
'system/chromeos/screen_security/screen_tray_item_unittest.cc',
'system/chromeos/session/logout_confirmation_controller_unittest.cc',
diff --git a/ash/common/DEPS b/ash/common/DEPS
index 1412c1f7..8d45fdc 100644
--- a/ash/common/DEPS
+++ b/ash/common/DEPS
@@ -1,6 +1,7 @@
include_rules = [
"-ash",
"+ash/ash_export.h",
+ "+ash/ash_switches.h",
"+ash/common",
"+ui",
"-ui/aura",
diff --git a/ash/system/chromeos/devicetype_utils.cc b/ash/common/system/chromeos/devicetype_utils.cc
similarity index 94%
rename from ash/system/chromeos/devicetype_utils.cc
rename to ash/common/system/chromeos/devicetype_utils.cc
index 7f31a388..920b50d 100644
--- a/ash/system/chromeos/devicetype_utils.cc
+++ b/ash/common/system/chromeos/devicetype_utils.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/devicetype_utils.h"
+#include "ash/common/system/chromeos/devicetype_utils.h"
#include "chromeos/system/devicetype.h"
#include "grit/ash_strings.h"
diff --git a/ash/system/chromeos/devicetype_utils.h b/ash/common/system/chromeos/devicetype_utils.h
similarity index 82%
rename from ash/system/chromeos/devicetype_utils.h
rename to ash/common/system/chromeos/devicetype_utils.h
index bcdc04f..a84fd87 100644
--- a/ash/system/chromeos/devicetype_utils.h
+++ b/ash/common/system/chromeos/devicetype_utils.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_DEVICETYPE_UTILS_H_
-#define ASH_SYSTEM_CHROMEOS_DEVICETYPE_UTILS_H_
+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_DEVICETYPE_UTILS_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_DEVICETYPE_UTILS_H_
#include "ash/ash_export.h"
#include "base/strings/string16.h"
@@ -23,4 +23,4 @@
} // namespace ash
-#endif // ASH_SYSTEM_CHROMEOS_DEVICETYPE_UTILS_H_
+#endif // ASH_COMMON_SYSTEM_CHROMEOS_DEVICETYPE_UTILS_H_
diff --git a/ash/system/chromeos/power/battery_notification.cc b/ash/common/system/chromeos/power/battery_notification.cc
similarity index 95%
rename from ash/system/chromeos/power/battery_notification.cc
rename to ash/common/system/chromeos/power/battery_notification.cc
index ba522453..67cf3959 100644
--- a/ash/system/chromeos/power/battery_notification.cc
+++ b/ash/common/system/chromeos/power/battery_notification.cc
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/system/chromeos/power/battery_notification.h"
+#include "ash/common/system/chromeos/power/battery_notification.h"
-#include "ash/system/chromeos/power/power_status.h"
-#include "ash/system/system_notifier.h"
+#include "ash/common/system/chromeos/power/power_status.h"
+#include "ash/common/system/system_notifier.h"
#include "base/i18n/message_formatter.h"
#include "base/i18n/time_formatting.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/ash/system/chromeos/power/battery_notification.h b/ash/common/system/chromeos/power/battery_notification.h
similarity index 76%
rename from ash/system/chromeos/power/battery_notification.h
rename to ash/common/system/chromeos/power/battery_notification.h
index 24284d19..fa698320 100644
--- a/ash/system/chromeos/power/battery_notification.h
+++ b/ash/common/system/chromeos/power/battery_notification.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_SYSTEM_CHROMEOS_POWER_BATTERY_NOTIFICATION_H_
-#define ASH_SYSTEM_CHROMEOS_POWER_BATTERY_NOTIFICATION_H_
+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_POWER_BATTERY_NOTIFICATION_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_POWER_BATTERY_NOTIFICATION_H_
#include "ash/ash_export.h"
-#include "ash/system/chromeos/power/tray_power.h"
+#include "ash/common/system/chromeos/power/tray_power.h"
#include "base/macros.h"
namespace message_center {
@@ -33,4 +33,4 @@
} // namespace ash
-#endif // ASH_SYSTEM_CHROMEOS_POWER_BATTERY_NOTIFICATION_H_
+#endif // ASH_COMMON_SYSTEM_CHROMEOS_POWER_BATTERY_NOTIFICATION_H_
diff --git a/ash/system/chromeos/power/dual_role_notification.cc b/ash/common/system/chromeos/power/dual_role_notification.cc
similarity index 96%
rename from ash/system/chromeos/power/dual_role_notification.cc
rename to ash/common/system/chromeos/power/dual_role_notification.cc
index 58e6aec..1b90278 100644
--- a/ash/system/chromeos/power/dual_role_notification.cc
+++ b/ash/common/system/chromeos/power/dual_role_notification.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/system/chromeos/power/dual_role_notification.h"
+#include "ash/common/system/chromeos/power/dual_role_notification.h"
#include <set>
+#include "ash/common/system/chromeos/power/power_status.h"
+#include "ash/common/system/system_notifier.h"
#include "ash/common/system/tray/system_tray_delegate.h"
#include "ash/common/wm_shell.h"
-#include "ash/system/chromeos/power/power_status.h"
-#include "ash/system/system_notifier.h"
#include "base/strings/utf_string_conversions.h"
#include "grit/ash_resources.h"
#include "grit/ash_strings.h"
diff --git a/ash/system/chromeos/power/dual_role_notification.h b/ash/common/system/chromeos/power/dual_role_notification.h
similarity index 80%
rename from ash/system/chromeos/power/dual_role_notification.h
rename to ash/common/system/chromeos/power/dual_role_notification.h
index d990093..a648783 100644
--- a/ash/system/chromeos/power/dual_role_notification.h
+++ b/ash/common/system/chromeos/power/dual_role_notification.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_POWER_DUAL_ROLE_NOTIFICATION_H_
-#define ASH_SYSTEM_CHROMEOS_POWER_DUAL_ROLE_NOTIFICATION_H_
+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_POWER_DUAL_ROLE_NOTIFICATION_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_POWER_DUAL_ROLE_NOTIFICATION_H_
#include <stddef.h>
#include <memory>
#include "ash/ash_export.h"
-#include "ash/system/chromeos/power/power_status.h"
+#include "ash/common/system/chromeos/power/power_status.h"
#include "base/macros.h"
namespace message_center {
@@ -45,4 +45,4 @@
} // namespace ash
-#endif // ASH_SYSTEM_CHROMEOS_POWER_DUAL_ROLE_NOTIFICATION_H_
+#endif // ASH_COMMON_SYSTEM_CHROMEOS_POWER_DUAL_ROLE_NOTIFICATION_H_
diff --git a/ash/system/chromeos/power/power_status.cc b/ash/common/system/chromeos/power/power_status.cc
similarity index 98%
rename from ash/system/chromeos/power/power_status.cc
rename to ash/common/system/chromeos/power/power_status.cc
index 5b2a0ad..806db34 100644
--- a/ash/system/chromeos/power/power_status.cc
+++ b/ash/common/system/chromeos/power/power_status.cc
@@ -2,13 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/system/chromeos/power/power_status.h"
+#include "ash/common/system/chromeos/power/power_status.h"
#include <algorithm>
#include <cmath>
-#include "ash/shell.h"
-#include "ash/shell_delegate.h"
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/ash/system/chromeos/power/power_status.h b/ash/common/system/chromeos/power/power_status.h
similarity index 97%
rename from ash/system/chromeos/power/power_status.h
rename to ash/common/system/chromeos/power/power_status.h
index 7fb94d72..26c4b19 100644
--- a/ash/system/chromeos/power/power_status.h
+++ b/ash/common/system/chromeos/power/power_status.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_POWER_POWER_STATUS_H_
-#define ASH_SYSTEM_CHROMEOS_POWER_POWER_STATUS_H_
+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_POWER_POWER_STATUS_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_POWER_POWER_STATUS_H_
#include <string>
#include <vector>
@@ -220,4 +220,4 @@
} // namespace ash
-#endif // ASH_SYSTEM_CHROMEOS_POWER_POWER_STATUS_H_
+#endif // ASH_COMMON_SYSTEM_CHROMEOS_POWER_POWER_STATUS_H_
diff --git a/ash/system/chromeos/power/power_status_unittest.cc b/ash/common/system/chromeos/power/power_status_unittest.cc
similarity index 98%
rename from ash/system/chromeos/power/power_status_unittest.cc
rename to ash/common/system/chromeos/power/power_status_unittest.cc
index a747e5d..5115828f 100644
--- a/ash/system/chromeos/power/power_status_unittest.cc
+++ b/ash/common/system/chromeos/power/power_status_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/power/power_status.h"
+#include "ash/common/system/chromeos/power/power_status.h"
#include <memory>
diff --git a/ash/system/chromeos/power/power_status_view.cc b/ash/common/system/chromeos/power/power_status_view.cc
similarity index 95%
rename from ash/system/chromeos/power/power_status_view.cc
rename to ash/common/system/chromeos/power/power_status_view.cc
index ec472cc..a30ce2c4 100644
--- a/ash/system/chromeos/power/power_status_view.cc
+++ b/ash/common/system/chromeos/power/power_status_view.cc
@@ -2,14 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/system/chromeos/power/power_status_view.h"
+#include "ash/common/system/chromeos/power/power_status_view.h"
+#include "ash/common/system/chromeos/power/power_status.h"
+#include "ash/common/system/chromeos/power/tray_power.h"
#include "ash/common/system/tray/fixed_sized_image_view.h"
#include "ash/common/system/tray/tray_constants.h"
-#include "ash/shell.h"
-#include "ash/shell_delegate.h"
-#include "ash/system/chromeos/power/power_status.h"
-#include "ash/system/chromeos/power/tray_power.h"
#include "base/i18n/message_formatter.h"
#include "base/i18n/time_formatting.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/ash/system/chromeos/power/power_status_view.h b/ash/common/system/chromeos/power/power_status_view.h
similarity index 86%
rename from ash/system/chromeos/power/power_status_view.h
rename to ash/common/system/chromeos/power/power_status_view.h
index c050d4d..5d92e1e 100644
--- a/ash/system/chromeos/power/power_status_view.h
+++ b/ash/common/system/chromeos/power/power_status_view.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_SYSTEM_CHROMEOS_POWER_POWER_STATUS_VIEW_H_
-#define ASH_SYSTEM_CHROMEOS_POWER_POWER_STATUS_VIEW_H_
+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_POWER_POWER_STATUS_VIEW_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_POWER_POWER_STATUS_VIEW_H_
#include "ash/ash_export.h"
-#include "ash/system/chromeos/power/power_status.h"
+#include "ash/common/system/chromeos/power/power_status.h"
#include "base/macros.h"
#include "ui/views/view.h"
@@ -60,4 +60,4 @@
} // namespace ash
-#endif // ASH_SYSTEM_CHROMEOS_POWER_POWER_STATUS_VIEW_H_
+#endif // ASH_COMMON_SYSTEM_CHROMEOS_POWER_POWER_STATUS_VIEW_H_
diff --git a/ash/system/chromeos/power/power_status_view_unittest.cc b/ash/common/system/chromeos/power/power_status_view_unittest.cc
similarity index 97%
rename from ash/system/chromeos/power/power_status_view_unittest.cc
rename to ash/common/system/chromeos/power/power_status_view_unittest.cc
index 67b9941..c2d4964 100644
--- a/ash/system/chromeos/power/power_status_view_unittest.cc
+++ b/ash/common/system/chromeos/power/power_status_view_unittest.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/system/chromeos/power/power_status_view.h"
+#include "ash/common/system/chromeos/power/power_status_view.h"
-#include "ash/system/chromeos/power/power_status.h"
+#include "ash/common/system/chromeos/power/power_status.h"
#include "ash/test/ash_test_base.h"
#include "chromeos/dbus/power_manager/power_supply_properties.pb.h"
#include "grit/ash_strings.h"
diff --git a/ash/system/chromeos/power/tray_power.cc b/ash/common/system/chromeos/power/tray_power.cc
similarity index 97%
rename from ash/system/chromeos/power/tray_power.cc
rename to ash/common/system/chromeos/power/tray_power.cc
index ecfaa85..22e8ec1 100644
--- a/ash/system/chromeos/power/tray_power.cc
+++ b/ash/common/system/chromeos/power/tray_power.cc
@@ -2,21 +2,20 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/system/chromeos/power/tray_power.h"
+#include "ash/common/system/chromeos/power/tray_power.h"
#include <utility>
#include "ash/ash_switches.h"
#include "ash/common/accessibility_delegate.h"
+#include "ash/common/system/chromeos/devicetype_utils.h"
+#include "ash/common/system/chromeos/power/battery_notification.h"
+#include "ash/common/system/chromeos/power/dual_role_notification.h"
#include "ash/common/system/date/date_view.h"
+#include "ash/common/system/system_notifier.h"
#include "ash/common/system/tray/system_tray_delegate.h"
#include "ash/common/system/tray/tray_constants.h"
#include "ash/common/system/tray/tray_utils.h"
-#include "ash/shell.h"
-#include "ash/system/chromeos/devicetype_utils.h"
-#include "ash/system/chromeos/power/battery_notification.h"
-#include "ash/system/chromeos/power/dual_role_notification.h"
-#include "ash/system/system_notifier.h"
#include "base/command_line.h"
#include "base/logging.h"
#include "base/metrics/histogram.h"
diff --git a/ash/system/chromeos/power/tray_power.h b/ash/common/system/chromeos/power/tray_power.h
similarity index 93%
rename from ash/system/chromeos/power/tray_power.h
rename to ash/common/system/chromeos/power/tray_power.h
index 4f47be8..9ad7516 100644
--- a/ash/system/chromeos/power/tray_power.h
+++ b/ash/common/system/chromeos/power/tray_power.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_POWER_TRAY_POWER_H_
-#define ASH_SYSTEM_CHROMEOS_POWER_TRAY_POWER_H_
+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_POWER_TRAY_POWER_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_POWER_TRAY_POWER_H_
#include <memory>
+#include "ash/common/system/chromeos/power/power_status.h"
#include "ash/common/system/tray/system_tray_item.h"
-#include "ash/system/chromeos/power/power_status.h"
#include "base/macros.h"
class SkBitmap;
@@ -121,4 +121,4 @@
} // namespace ash
-#endif // ASH_SYSTEM_CHROMEOS_POWER_TRAY_POWER_H_
+#endif // ASH_COMMON_SYSTEM_CHROMEOS_POWER_TRAY_POWER_H_
diff --git a/ash/system/chromeos/power/tray_power_unittest.cc b/ash/common/system/chromeos/power/tray_power_unittest.cc
similarity index 99%
rename from ash/system/chromeos/power/tray_power_unittest.cc
rename to ash/common/system/chromeos/power/tray_power_unittest.cc
index 5423631..d2d102f 100644
--- a/ash/system/chromeos/power/tray_power_unittest.cc
+++ b/ash/common/system/chromeos/power/tray_power_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/power/tray_power.h"
+#include "ash/common/system/chromeos/power/tray_power.h"
#include <map>
#include <memory>
diff --git a/ash/system/chromeos/settings/tray_settings.cc b/ash/common/system/chromeos/settings/tray_settings.cc
similarity index 86%
rename from ash/system/chromeos/settings/tray_settings.cc
rename to ash/common/system/chromeos/settings/tray_settings.cc
index 5c1ce9b7..33cf711 100644
--- a/ash/system/chromeos/settings/tray_settings.cc
+++ b/ash/common/system/chromeos/settings/tray_settings.cc
@@ -2,17 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/system/chromeos/settings/tray_settings.h"
+#include "ash/common/system/chromeos/settings/tray_settings.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/system/chromeos/power/power_status.h"
+#include "ash/common/system/chromeos/power/power_status_view.h"
#include "ash/common/system/tray/actionable_view.h"
#include "ash/common/system/tray/fixed_sized_image_view.h"
#include "ash/common/system/tray/system_tray_delegate.h"
#include "ash/common/system/tray/tray_constants.h"
#include "ash/common/wm_shell.h"
-#include "ash/shell.h"
-#include "ash/system/chromeos/power/power_status.h"
-#include "ash/system/chromeos/power/power_status_view.h"
#include "base/logging.h"
#include "base/strings/utf_string_conversions.h"
#include "grit/ash_resources.h"
@@ -40,12 +39,11 @@
ash::kTrayPopupPaddingBetweenItems));
bool power_view_right_align = false;
- bool userAddingRunning = ash::Shell::GetInstance()
- ->session_state_delegate()
- ->IsInSecondaryLoginScreen();
-
if (login_status_ != LoginStatus::NOT_LOGGED_IN &&
- login_status_ != LoginStatus::LOCKED && !userAddingRunning) {
+ login_status_ != LoginStatus::LOCKED &&
+ !WmShell::Get()
+ ->GetSessionStateDelegate()
+ ->IsInSecondaryLoginScreen()) {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
views::ImageView* icon =
new ash::FixedSizedImageView(0, ash::kTrayPopupItemHeight);
@@ -73,12 +71,9 @@
// Overridden from ash::ActionableView.
bool PerformAction(const ui::Event& event) override {
- bool adding_user = Shell::GetInstance()
- ->session_state_delegate()
- ->IsInSecondaryLoginScreen();
-
if (login_status_ == LoginStatus::NOT_LOGGED_IN ||
- login_status_ == LoginStatus::LOCKED || adding_user) {
+ login_status_ == LoginStatus::LOCKED ||
+ WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen()) {
return false;
}
@@ -157,15 +152,13 @@
return NULL;
}
-void TraySettings::DestroyTrayView() {
-}
+void TraySettings::DestroyTrayView() {}
void TraySettings::DestroyDefaultView() {
default_view_ = NULL;
}
-void TraySettings::DestroyDetailedView() {
-}
+void TraySettings::DestroyDetailedView() {}
void TraySettings::UpdateAfterLoginStatusChange(LoginStatus status) {}
diff --git a/ash/system/chromeos/settings/tray_settings.h b/ash/common/system/chromeos/settings/tray_settings.h
similarity index 83%
rename from ash/system/chromeos/settings/tray_settings.h
rename to ash/common/system/chromeos/settings/tray_settings.h
index 5f5e0f891..2a46942b 100644
--- a/ash/system/chromeos/settings/tray_settings.h
+++ b/ash/common/system/chromeos/settings/tray_settings.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_SETTINGS_TRAY_SETTINGS_H_
-#define ASH_SYSTEM_CHROMEOS_SETTINGS_TRAY_SETTINGS_H_
+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_SETTINGS_TRAY_SETTINGS_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_SETTINGS_TRAY_SETTINGS_H_
#include "ash/common/system/tray/system_tray_item.h"
#include "base/macros.h"
@@ -35,4 +35,4 @@
} // namespace ash
-#endif // ASH_SYSTEM_CHROMEOS_SETTINGS_TRAY_SETTINGS_H_
+#endif // ASH_COMMON_SYSTEM_CHROMEOS_SETTINGS_TRAY_SETTINGS_H_
diff --git a/ash/system/system_notifier.cc b/ash/common/system/system_notifier.cc
similarity index 98%
rename from ash/system/system_notifier.cc
rename to ash/common/system/system_notifier.cc
index 76875de..1d35d4f 100644
--- a/ash/system/system_notifier.cc
+++ b/ash/common/system/system_notifier.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/system_notifier.h"
+#include "ash/common/system/system_notifier.h"
#include "base/logging.h"
diff --git a/ash/system/system_notifier.h b/ash/common/system/system_notifier.h
similarity index 93%
rename from ash/system/system_notifier.h
rename to ash/common/system/system_notifier.h
index 8febc9f..a43484b 100644
--- a/ash/system/system_notifier.h
+++ b/ash/common/system/system_notifier.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_SYSTEM_NOTIFIER_H_
-#define ASH_SYSTEM_SYSTEM_NOTIFIER_H_
+#ifndef ASH_COMMON_SYSTEM_SYSTEM_NOTIFIER_H_
+#define ASH_COMMON_SYSTEM_SYSTEM_NOTIFIER_H_
#include <string>
@@ -48,4 +48,4 @@
} // namespace system_notifier
} // namespace ash
-#endif // ASH_SYSTEM_SYSTEM_NOTIFIER_H_
+#endif // ASH_COMMON_SYSTEM_SYSTEM_NOTIFIER_H_
diff --git a/ash/display/display_util.cc b/ash/display/display_util.cc
index ec36ab2..dd62d4b4 100644
--- a/ash/display/display_util.cc
+++ b/ash/display/display_util.cc
@@ -6,12 +6,12 @@
#include <algorithm>
+#include "ash/common/system/system_notifier.h"
#include "ash/display/display_info.h"
#include "ash/display/display_manager.h"
#include "ash/host/ash_window_tree_host.h"
#include "ash/new_window_delegate.h"
#include "ash/shell.h"
-#include "ash/system/system_notifier.h"
#include "base/strings/string_number_conversions.h"
#include "grit/ash_resources.h"
#include "ui/aura/env.h"
diff --git a/ash/display/resolution_notification_controller.cc b/ash/display/resolution_notification_controller.cc
index f740ea4..9d66bc80 100644
--- a/ash/display/resolution_notification_controller.cc
+++ b/ash/display/resolution_notification_controller.cc
@@ -6,10 +6,10 @@
#include <utility>
+#include "ash/common/system/system_notifier.h"
#include "ash/display/display_info.h"
#include "ash/display/display_manager.h"
#include "ash/shell.h"
-#include "ash/system/system_notifier.h"
#include "base/strings/utf_string_conversions.h"
#include "grit/ash_resources.h"
#include "grit/ash_strings.h"
diff --git a/ash/shell.cc b/ash/shell.cc
index e17a8da..e1260682 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -127,6 +127,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/power/power_status.h"
#include "ash/display/display_change_observer_chromeos.h"
#include "ash/display/display_color_manager_chromeos.h"
#include "ash/display/display_error_observer_chromeos.h"
@@ -137,7 +138,6 @@
#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/power_status.h"
#include "ash/system/chromeos/power/video_activity_notifier.h"
#include "ash/system/chromeos/session/last_window_closed_logout_reminder.h"
#include "ash/system/chromeos/session/logout_confirmation_controller.h"
diff --git a/ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc b/ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc
index 1864a1cf..d4985d9 100644
--- a/ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc
+++ b/ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#include "ash/system/system_notifier.h"
+#include "ash/common/system/system_notifier.h"
#include "base/bind.h"
#include "base/callback.h"
#include "base/logging.h"
diff --git a/ash/system/chromeos/screen_security/screen_capture_tray_item.cc b/ash/system/chromeos/screen_security/screen_capture_tray_item.cc
index cfa538b..fe0dc5ad 100644
--- a/ash/system/chromeos/screen_security/screen_capture_tray_item.cc
+++ b/ash/system/chromeos/screen_security/screen_capture_tray_item.cc
@@ -6,9 +6,9 @@
#include <utility>
+#include "ash/common/system/system_notifier.h"
#include "ash/common/wm_shell.h"
#include "ash/shell.h"
-#include "ash/system/system_notifier.h"
#include "grit/ash_resources.h"
#include "grit/ash_strings.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/ash/system/chromeos/screen_security/screen_share_tray_item.cc b/ash/system/chromeos/screen_security/screen_share_tray_item.cc
index d04a04fc..2c8bd67 100644
--- a/ash/system/chromeos/screen_security/screen_share_tray_item.cc
+++ b/ash/system/chromeos/screen_security/screen_share_tray_item.cc
@@ -6,8 +6,8 @@
#include <utility>
+#include "ash/common/system/system_notifier.h"
#include "ash/shell.h"
-#include "ash/system/system_notifier.h"
#include "grit/ash_resources.h"
#include "grit/ash_strings.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/ash/system/chromeos/session/tray_session_length_limit.cc b/ash/system/chromeos/session/tray_session_length_limit.cc
index 5588718..0dec056 100644
--- a/ash/system/chromeos/session/tray_session_length_limit.cc
+++ b/ash/system/chromeos/session/tray_session_length_limit.cc
@@ -8,11 +8,11 @@
#include <memory>
#include <utility>
+#include "ash/common/system/system_notifier.h"
#include "ash/common/system/tray/system_tray_delegate.h"
#include "ash/common/wm_shell.h"
#include "ash/shell.h"
#include "ash/system/chromeos/label_tray_view.h"
-#include "ash/system/system_notifier.h"
#include "ash/system/tray/system_tray.h"
#include "ash/system/tray/system_tray_notifier.h"
#include "base/logging.h"
diff --git a/ash/system/chromeos/supervised/tray_supervised_user.cc b/ash/system/chromeos/supervised/tray_supervised_user.cc
index df6e92b..c694c7f5 100644
--- a/ash/system/chromeos/supervised/tray_supervised_user.cc
+++ b/ash/system/chromeos/supervised/tray_supervised_user.cc
@@ -6,11 +6,11 @@
#include <utility>
+#include "ash/common/system/system_notifier.h"
#include "ash/common/system/tray/system_tray_delegate.h"
#include "ash/common/system/tray/tray_notification_view.h"
#include "ash/common/wm_shell.h"
#include "ash/system/chromeos/label_tray_view.h"
-#include "ash/system/system_notifier.h"
#include "ash/system/tray/system_tray_notifier.h"
#include "ash/system/user/login_status.h"
#include "base/callback.h"
diff --git a/ash/system/chromeos/tray_display.cc b/ash/system/chromeos/tray_display.cc
index 9462d51..d2eba2a 100644
--- a/ash/system/chromeos/tray_display.cc
+++ b/ash/system/chromeos/tray_display.cc
@@ -8,6 +8,8 @@
#include <utility>
#include <vector>
+#include "ash/common/system/chromeos/devicetype_utils.h"
+#include "ash/common/system/system_notifier.h"
#include "ash/common/system/tray/actionable_view.h"
#include "ash/common/system/tray/fixed_sized_image_view.h"
#include "ash/common/system/tray/system_tray_delegate.h"
@@ -18,8 +20,6 @@
#include "ash/display/screen_orientation_controller_chromeos.h"
#include "ash/display/window_tree_host_manager.h"
#include "ash/shell.h"
-#include "ash/system/chromeos/devicetype_utils.h"
-#include "ash/system/system_notifier.h"
#include "ash/system/tray/system_tray.h"
#include "base/bind.h"
#include "base/strings/string_util.h"
diff --git a/ash/system/chromeos/tray_display_unittest.cc b/ash/system/chromeos/tray_display_unittest.cc
index ce5a878..374d9d3 100644
--- a/ash/system/chromeos/tray_display_unittest.cc
+++ b/ash/system/chromeos/tray_display_unittest.cc
@@ -4,11 +4,11 @@
#include "ash/system/chromeos/tray_display.h"
+#include "ash/common/system/chromeos/devicetype_utils.h"
#include "ash/display/display_manager.h"
#include "ash/root_window_controller.h"
#include "ash/screen_util.h"
#include "ash/shell.h"
-#include "ash/system/chromeos/devicetype_utils.h"
#include "ash/system/tray/system_tray.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/display_manager_test_api.h"
diff --git a/ash/system/locale/locale_notification_controller.cc b/ash/system/locale/locale_notification_controller.cc
index 174a662c..bc514d58 100644
--- a/ash/system/locale/locale_notification_controller.cc
+++ b/ash/system/locale/locale_notification_controller.cc
@@ -6,8 +6,8 @@
#include <utility>
+#include "ash/common/system/system_notifier.h"
#include "ash/shell.h"
-#include "ash/system/system_notifier.h"
#include "ash/system/tray/system_tray_notifier.h"
#include "base/strings/string16.h"
#include "grit/ash_resources.h"
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index eec513c..1fe6be7 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -46,6 +46,9 @@
#include "ui/views/view.h"
#if defined(OS_CHROMEOS)
+#include "ash/common/system/chromeos/power/power_status.h"
+#include "ash/common/system/chromeos/power/tray_power.h"
+#include "ash/common/system/chromeos/settings/tray_settings.h"
#include "ash/system/chromeos/audio/tray_audio_chromeos.h"
#include "ash/system/chromeos/bluetooth/tray_bluetooth.h"
#include "ash/system/chromeos/brightness/tray_brightness.h"
@@ -53,13 +56,10 @@
#include "ash/system/chromeos/network/tray_network.h"
#include "ash/system/chromeos/network/tray_sms.h"
#include "ash/system/chromeos/network/tray_vpn.h"
-#include "ash/system/chromeos/power/power_status.h"
-#include "ash/system/chromeos/power/tray_power.h"
#include "ash/system/chromeos/rotation/tray_rotation_lock.h"
#include "ash/system/chromeos/screen_security/screen_capture_tray_item.h"
#include "ash/system/chromeos/screen_security/screen_share_tray_item.h"
#include "ash/system/chromeos/session/tray_session_length_limit.h"
-#include "ash/system/chromeos/settings/tray_settings.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"
diff --git a/chrome/browser/chrome_webusb_browser_client.cc b/chrome/browser/chrome_webusb_browser_client.cc
index b966ace..187cd71 100644
--- a/chrome/browser/chrome_webusb_browser_client.cc
+++ b/chrome/browser/chrome_webusb_browser_client.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "ash/system/system_notifier.h"
+#include "ash/common/system/system_notifier.h"
#include "base/macros.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/chromeos/arc/arc_auth_notification.cc b/chrome/browser/chromeos/arc/arc_auth_notification.cc
index 98e7135..1617cf4 100644
--- a/chrome/browser/chromeos/arc/arc_auth_notification.cc
+++ b/chrome/browser/chromeos/arc/arc_auth_notification.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/chromeos/arc/arc_auth_notification.h"
-#include "ash/system/chromeos/devicetype_utils.h"
+#include "ash/common/system/chromeos/devicetype_utils.h"
#include "base/macros.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/chromeos/arc/arc_auth_service.h"
diff --git a/chrome/browser/chromeos/arc/arc_support_host.cc b/chrome/browser/chromeos/arc/arc_support_host.cc
index 68c02fe..25c8cc01 100644
--- a/chrome/browser/chromeos/arc/arc_support_host.cc
+++ b/chrome/browser/chromeos/arc/arc_support_host.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/chromeos/arc/arc_support_host.h"
-#include "ash/system/chromeos/devicetype_utils.h"
+#include "ash/common/system/chromeos/devicetype_utils.h"
#include "base/i18n/timezone.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
diff --git a/chrome/browser/chromeos/hats/hats_notification_controller.cc b/chrome/browser/chromeos/hats/hats_notification_controller.cc
index edf6000..fc2dc29 100644
--- a/chrome/browser/chromeos/hats/hats_notification_controller.cc
+++ b/chrome/browser/chromeos/hats/hats_notification_controller.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/chromeos/hats/hats_notification_controller.h"
-#include "ash/system/system_notifier.h"
+#include "ash/common/system/system_notifier.h"
#include "base/feature_list.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/chromeos/net/network_portal_notification_controller.cc b/chrome/browser/chromeos/net/network_portal_notification_controller.cc
index 0080161..f90253f4 100644
--- a/chrome/browser/chromeos/net/network_portal_notification_controller.cc
+++ b/chrome/browser/chromeos/net/network_portal_notification_controller.cc
@@ -9,8 +9,8 @@
#include <memory>
#include <vector>
+#include "ash/common/system/system_notifier.h"
#include "ash/shell.h"
-#include "ash/system/system_notifier.h"
#include "ash/system/tray/system_tray_notifier.h"
#include "base/command_line.h"
#include "base/compiler_specific.h"
diff --git a/chrome/browser/chromeos/status/data_promo_notification.cc b/chrome/browser/chromeos/status/data_promo_notification.cc
index 8b177bc..c50a0ed 100644
--- a/chrome/browser/chromeos/status/data_promo_notification.cc
+++ b/chrome/browser/chromeos/status/data_promo_notification.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/chromeos/status/data_promo_notification.h"
-#include "ash/system/system_notifier.h"
+#include "ash/common/system/system_notifier.h"
#include "base/command_line.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc
index 37a0da2..f00088f 100644
--- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc
+++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc
@@ -53,7 +53,7 @@
#include "ui/gfx/range/range.h"
#if defined(OS_CHROMEOS)
-#include "ash/system/chromeos/devicetype_utils.h"
+#include "ash/common/system/chromeos/devicetype_utils.h"
#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.h"
#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h"
#include "components/user_manager/user.h"
diff --git a/chrome/browser/extensions/api/hotword_private/hotword_private_api.cc b/chrome/browser/extensions/api/hotword_private/hotword_private_api.cc
index ac98050..6b87899 100644
--- a/chrome/browser/extensions/api/hotword_private/hotword_private_api.cc
+++ b/chrome/browser/extensions/api/hotword_private/hotword_private_api.cc
@@ -30,7 +30,7 @@
#include "ui/base/webui/web_ui_util.h"
#if defined(OS_CHROMEOS)
-#include "ash/system/chromeos/devicetype_utils.h"
+#include "ash/common/system/chromeos/devicetype_utils.h"
#endif
namespace extensions {
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index 5fbc12ec6..2a6c428 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -47,7 +47,7 @@
#include "ui/base/resource/resource_bundle.h"
#if defined(OS_CHROMEOS)
-#include "ash/system/chromeos/devicetype_utils.h"
+#include "ash/common/system/chromeos/devicetype_utils.h"
#include "components/chrome_apps/grit/chrome_apps_resources.h"
#include "components/user_manager/user_manager.h"
#include "grit/keyboard_resources.h"
diff --git a/chrome/browser/notifications/fullscreen_notification_blocker.cc b/chrome/browser/notifications/fullscreen_notification_blocker.cc
index c9831fc..a0c0a7b 100644
--- a/chrome/browser/notifications/fullscreen_notification_blocker.cc
+++ b/chrome/browser/notifications/fullscreen_notification_blocker.cc
@@ -10,10 +10,10 @@
#include "content/public/browser/notification_service.h"
#if defined(USE_ASH)
+#include "ash/common/system/system_notifier.h"
#include "ash/common/wm/window_state.h"
#include "ash/root_window_controller.h"
#include "ash/shell.h"
-#include "ash/system/system_notifier.h"
#include "ash/wm/window_state_aura.h"
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
diff --git a/chrome/browser/notifications/login_state_notification_blocker_chromeos.cc b/chrome/browser/notifications/login_state_notification_blocker_chromeos.cc
index 6cd5fdb8..1caad4b 100644
--- a/chrome/browser/notifications/login_state_notification_blocker_chromeos.cc
+++ b/chrome/browser/notifications/login_state_notification_blocker_chromeos.cc
@@ -4,9 +4,9 @@
#include "chrome/browser/notifications/login_state_notification_blocker_chromeos.h"
+#include "ash/common/system/system_notifier.h"
#include "ash/common/wm_shell.h"
#include "ash/root_window_controller.h"
-#include "ash/system/system_notifier.h"
#include "ash/wm/window_properties.h"
#include "chrome/browser/chrome_notification_types.h"
#include "content/public/browser/notification_service.h"
diff --git a/chrome/browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc b/chrome/browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc
index 92cc81f..bd7b90d 100644
--- a/chrome/browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc
+++ b/chrome/browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ash/common/system/system_notifier.h"
#include "ash/shell.h"
-#include "ash/system/system_notifier.h"
#include "base/command_line.h"
#include "base/macros.h"
#include "chrome/browser/chromeos/login/login_manager_test.h"
diff --git a/chrome/browser/notifications/login_state_notification_blocker_chromeos_unittest.cc b/chrome/browser/notifications/login_state_notification_blocker_chromeos_unittest.cc
index dd52c0c..b5d3a1f 100644
--- a/chrome/browser/notifications/login_state_notification_blocker_chromeos_unittest.cc
+++ b/chrome/browser/notifications/login_state_notification_blocker_chromeos_unittest.cc
@@ -6,8 +6,8 @@
#include <memory>
+#include "ash/common/system/system_notifier.h"
#include "ash/shell.h"
-#include "ash/system/system_notifier.h"
#include "ash/test/ash_test_base.h"
#include "base/command_line.h"
#include "base/macros.h"
diff --git a/chrome/browser/notifications/message_center_settings_controller.cc b/chrome/browser/notifications/message_center_settings_controller.cc
index 1e0dc01..8de630e 100644
--- a/chrome/browser/notifications/message_center_settings_controller.cc
+++ b/chrome/browser/notifications/message_center_settings_controller.cc
@@ -47,7 +47,7 @@
#include "ui/strings/grit/ui_strings.h"
#if defined(OS_CHROMEOS)
-#include "ash/system/system_notifier.h"
+#include "ash/common/system/system_notifier.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/notifications/arc_notifier_manager.h"
#include "components/arc/arc_bridge_service.h"
diff --git a/chrome/browser/notifications/message_center_settings_controller_unittest.cc b/chrome/browser/notifications/message_center_settings_controller_unittest.cc
index aed37ce..ea47722 100644
--- a/chrome/browser/notifications/message_center_settings_controller_unittest.cc
+++ b/chrome/browser/notifications/message_center_settings_controller_unittest.cc
@@ -26,7 +26,7 @@
#include "ui/message_center/notifier_settings.h"
#if defined(OS_CHROMEOS)
-#include "ash/system/system_notifier.h"
+#include "ash/common/system/system_notifier.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#endif
diff --git a/chrome/browser/signin/easy_unlock_screenlock_state_handler.cc b/chrome/browser/signin/easy_unlock_screenlock_state_handler.cc
index ed7eee6..b632fab8 100644
--- a/chrome/browser/signin/easy_unlock_screenlock_state_handler.cc
+++ b/chrome/browser/signin/easy_unlock_screenlock_state_handler.cc
@@ -15,7 +15,7 @@
#include "ui/base/l10n/l10n_util.h"
#if defined(OS_CHROMEOS)
-#include "ash/system/chromeos/devicetype_utils.h"
+#include "ash/common/system/chromeos/devicetype_utils.h"
#endif
using proximity_auth::ScreenlockState;
diff --git a/chrome/browser/signin/signin_error_notifier_ash.cc b/chrome/browser/signin/signin_error_notifier_ash.cc
index 85e1b94..bb17d7f 100644
--- a/chrome/browser/signin/signin_error_notifier_ash.cc
+++ b/chrome/browser/signin/signin_error_notifier_ash.cc
@@ -4,9 +4,9 @@
#include "chrome/browser/signin/signin_error_notifier_ash.h"
+#include "ash/common/system/system_notifier.h"
#include "ash/shell.h"
#include "ash/shell_delegate.h"
-#include "ash/system/system_notifier.h"
#include "base/logging.h"
#include "base/macros.h"
#include "base/strings/string16.h"
diff --git a/chrome/browser/sync/sync_error_notifier_ash.cc b/chrome/browser/sync/sync_error_notifier_ash.cc
index 4e4f3e2..02ca4d3 100644
--- a/chrome/browser/sync/sync_error_notifier_ash.cc
+++ b/chrome/browser/sync/sync_error_notifier_ash.cc
@@ -4,9 +4,9 @@
#include "chrome/browser/sync/sync_error_notifier_ash.h"
+#include "ash/common/system/system_notifier.h"
#include "ash/shell.h"
#include "ash/shell_delegate.h"
-#include "ash/system/system_notifier.h"
#include "base/macros.h"
#include "base/strings/string16.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/ash/chrome_screenshot_grabber.cc b/chrome/browser/ui/ash/chrome_screenshot_grabber.cc
index 861251a..a1078e6b 100644
--- a/chrome/browser/ui/ash/chrome_screenshot_grabber.cc
+++ b/chrome/browser/ui/ash/chrome_screenshot_grabber.cc
@@ -6,8 +6,8 @@
#include <stddef.h>
+#include "ash/common/system/system_notifier.h"
#include "ash/shell.h"
-#include "ash/system/system_notifier.h"
#include "base/base64.h"
#include "base/bind.h"
#include "base/callback.h"
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos.cc b/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos.cc
index c89b3ebd..b36a5df2 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos.h"
-#include "ash/system/system_notifier.h"
+#include "ash/common/system/system_notifier.h"
#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
#include "components/signin/core/account_id/account_id.h"
#include "ui/message_center/message_center.h"
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc
index 6eac3f3..2015efea9 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/system/system_notifier.h"
#include "ash/shell.h"
-#include "ash/system/system_notifier.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/test_session_state_delegate.h"
#include "ash/test/test_shell_delegate.h"
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
index 8e5bfa4..32fed2c 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
@@ -16,6 +16,7 @@
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/session/session_state_observer.h"
#include "ash/common/shell_window_ids.h"
+#include "ash/common/system/chromeos/power/power_status.h"
#include "ash/common/system/chromeos/shutdown_policy_observer.h"
#include "ash/common/system/date/clock_observer.h"
#include "ash/common/system/tray/system_tray_delegate.h"
@@ -28,7 +29,6 @@
#include "ash/shell.h"
#include "ash/shell_delegate.h"
#include "ash/system/chromeos/bluetooth/bluetooth_observer.h"
-#include "ash/system/chromeos/power/power_status.h"
#include "ash/system/chromeos/session/logout_button_observer.h"
#include "ash/system/ime/ime_observer.h"
#include "ash/system/tray/system_tray.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc
index 53cb6b5d..a3ab879 100644
--- a/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h"
-#include "ash/system/chromeos/devicetype_utils.h"
+#include "ash/common/system/chromeos/devicetype_utils.h"
#include "base/message_loop/message_loop.h"
#include "base/time/time.h"
#include "chrome/browser/chromeos/login/screens/network_error_model.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
index f8795e98..188ffd2 100644
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
-#include "ash/system/chromeos/devicetype_utils.h"
+#include "ash/common/system/chromeos/devicetype_utils.h"
#include "base/bind.h"
#include "base/guid.h"
#include "base/logging.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index d738494..88971ea 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -9,8 +9,8 @@
#include <algorithm>
#include <vector>
+#include "ash/common/system/chromeos/devicetype_utils.h"
#include "ash/shell.h"
-#include "ash/system/chromeos/devicetype_utils.h"
#include "ash/wm/lock_state_controller.h"
#include "base/bind.h"
#include "base/location.h"
diff --git a/chrome/browser/ui/webui/help/help_handler.cc b/chrome/browser/ui/webui/help/help_handler.cc
index 3fd9934..423444a 100644
--- a/chrome/browser/ui/webui/help/help_handler.cc
+++ b/chrome/browser/ui/webui/help/help_handler.cc
@@ -8,7 +8,7 @@
#include <string>
-#include "ash/system/chromeos/devicetype_utils.h"
+#include "ash/common/system/chromeos/devicetype_utils.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/command_line.h"
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 7c2be992..0d435e05 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -112,9 +112,9 @@
#if defined(OS_CHROMEOS)
#include "ash/ash_switches.h"
+#include "ash/common/system/chromeos/devicetype_utils.h"
#include "ash/desktop_background/user_wallpaper_delegate.h"
#include "ash/shell.h"
-#include "ash/system/chromeos/devicetype_utils.h"
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/chromeos/accessibility/accessibility_util.h"
#include "chrome/browser/chromeos/arc/arc_auth_service.h"
diff --git a/chrome/browser/ui/webui/options/chromeos/consumer_management_handler.cc b/chrome/browser/ui/webui/options/chromeos/consumer_management_handler.cc
index ea72850..7acbd03 100644
--- a/chrome/browser/ui/webui/options/chromeos/consumer_management_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/consumer_management_handler.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/ui/webui/options/chromeos/consumer_management_handler.h"
-#include "ash/system/chromeos/devicetype_utils.h"
+#include "ash/common/system/chromeos/devicetype_utils.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/logging.h"
diff --git a/chrome/browser/ui/webui/options/chromeos/power_handler.h b/chrome/browser/ui/webui/options/chromeos/power_handler.h
index 68667c8..b5045e6 100644
--- a/chrome/browser/ui/webui/options/chromeos/power_handler.h
+++ b/chrome/browser/ui/webui/options/chromeos/power_handler.h
@@ -5,7 +5,7 @@
#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_POWER_HANDLER_H_
#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_POWER_HANDLER_H_
-#include "ash/system/chromeos/power/power_status.h"
+#include "ash/common/system/chromeos/power/power_status.h"
#include "base/macros.h"
#include "base/strings/string16.h"
#include "chrome/browser/ui/webui/options/options_ui.h"
diff --git a/chrome/browser/ui/webui/settings/about_handler.cc b/chrome/browser/ui/webui/settings/about_handler.cc
index 6f9ca5d..50db13d 100644
--- a/chrome/browser/ui/webui/settings/about_handler.cc
+++ b/chrome/browser/ui/webui/settings/about_handler.cc
@@ -8,7 +8,7 @@
#include <string>
-#include "ash/system/chromeos/devicetype_utils.h"
+#include "ash/common/system/chromeos/devicetype_utils.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/command_line.h"
diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
index 1f8269c..20cb4885 100644
--- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
@@ -28,7 +28,7 @@
#include "ui/base/l10n/l10n_util.h"
#if defined(OS_CHROMEOS)
-#include "ash/system/chromeos/devicetype_utils.h"
+#include "ash/common/system/chromeos/devicetype_utils.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/ui/webui/chromeos/ui_account_tweaks.h"
#include "chromeos/chromeos_switches.h"
