Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1775)

Unified Diff: ash/common/system/date/tray_system_info.cc

Issue 2591553002: Remove non-cros support from ash/common/system. (Closed)
Patch Set: jc review + rebase Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/system/date/tray_system_info.h ('k') | ash/common/system/status_area_widget.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f4c7a97d386d64fb174cbfb19a59363bc1c860bf..aad34ffb1f3af725c0a4641141b80efa665c9a77 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,20 +13,14 @@
#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)
: SystemTrayItem(system_tray, UMA_DATE),
tray_view_(nullptr),
default_view_(nullptr),
- login_status_(LoginStatus::NOT_LOGGED_IN) {
-#if defined(OS_CHROMEOS)
- system_clock_observer_.reset(new SystemClockObserver());
-#endif
+ login_status_(LoginStatus::NOT_LOGGED_IN),
+ system_clock_observer_(new SystemClockObserver()) {
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_;
}
« no previous file with comments | « ash/common/system/date/tray_system_info.h ('k') | ash/common/system/status_area_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698