Index: ash/common/system/date/tray_system_info.cc |
diff --git a/ash/common/system/date/tray_system_info.cc b/ash/common/system/date/tray_system_info.cc |
index 87e9c7438856732a1c7f6c9208d1717a4f5962bd..91ec2dcc08d115a2bea22a24bcdc0fab8d977ca0 100644 |
--- a/ash/common/system/date/tray_system_info.cc |
+++ b/ash/common/system/date/tray_system_info.cc |
@@ -5,6 +5,7 @@ |
#include "ash/common/system/date/tray_system_info.h" |
#include "ash/common/shelf/wm_shelf_util.h" |
+#include "ash/common/system/chromeos/system_clock_observer.h" |
#include "ash/common/system/date/date_view.h" |
#include "ash/common/system/date/system_info_default_view.h" |
#include "ash/common/system/tray/system_tray.h" |
@@ -12,10 +13,6 @@ |
#include "ash/common/system/tray/tray_item_view.h" |
#include "ash/common/wm_shell.h" |
-#if defined(OS_CHROMEOS) |
-#include "ash/common/system/chromeos/system_clock_observer.h" |
-#endif |
- |
namespace ash { |
TraySystemInfo::TraySystemInfo(SystemTray* system_tray) |
@@ -23,9 +20,7 @@ TraySystemInfo::TraySystemInfo(SystemTray* system_tray) |
tray_view_(nullptr), |
default_view_(nullptr), |
login_status_(LoginStatus::NOT_LOGGED_IN) { |
-#if defined(OS_CHROMEOS) |
system_clock_observer_.reset(new SystemClockObserver()); |
James Cook
2016/12/20 00:02:24
nit: ditto, initializer list
Evan Stade
2016/12/20 18:25:21
Done.
|
-#endif |
WmShell::Get()->system_tray_notifier()->AddClockObserver(this); |
} |
@@ -60,12 +55,10 @@ views::View* TraySystemInfo::CreateTrayView(LoginStatus status) { |
views::View* TraySystemInfo::CreateDefaultView(LoginStatus status) { |
default_view_ = new SystemInfoDefaultView(this, status); |
-#if defined(OS_CHROMEOS) |
// Save the login status we created the view with. |
login_status_ = status; |
OnSystemClockCanSetTimeChanged(system_clock_observer_->can_set_time()); |
-#endif |
return default_view_; |
} |