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

Unified Diff: ash/system/date/tray_date.cc

Issue 2064953002: mash: Migrate tray date view to //ash/common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@trayviews
Patch Set: review feedback Created 4 years, 6 months 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/system/date/tray_date.h ('k') | ash/system/tray/system_tray_notifier.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/date/tray_date.cc
diff --git a/ash/system/date/tray_date.cc b/ash/system/date/tray_date.cc
index 6dd842b4da54445b7cecb29f52595ac6a2c3fad8..9d2e628b086e589a521bfbe08819a6b0eac52b21 100644
--- a/ash/system/date/tray_date.cc
+++ b/ash/system/date/tray_date.cc
@@ -6,12 +6,11 @@
#include "ash/common/shelf/wm_shelf_util.h"
#include "ash/common/system/tray/tray_item_view.h"
-#include "ash/shelf/shelf_util.h"
-#include "ash/shell.h"
+#include "ash/common/system/tray/wm_system_tray_notifier.h"
+#include "ash/common/wm_shell.h"
#include "ash/system/date/date_default_view.h"
#include "ash/system/date/date_view.h"
#include "ash/system/tray/system_tray.h"
-#include "ash/system/tray/system_tray_notifier.h"
#if defined(OS_CHROMEOS)
#include "ash/system/chromeos/system_clock_observer.h"
@@ -27,11 +26,11 @@ TrayDate::TrayDate(SystemTray* system_tray)
#if defined(OS_CHROMEOS)
system_clock_observer_.reset(new SystemClockObserver());
#endif
- Shell::GetInstance()->system_tray_notifier()->AddClockObserver(this);
+ WmShell::Get()->system_tray_notifier()->AddClockObserver(this);
}
TrayDate::~TrayDate() {
- Shell::GetInstance()->system_tray_notifier()->RemoveClockObserver(this);
+ WmShell::Get()->system_tray_notifier()->RemoveClockObserver(this);
}
views::View* TrayDate::GetHelpButtonView() const {
« no previous file with comments | « ash/system/date/tray_date.h ('k') | ash/system/tray/system_tray_notifier.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698