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

Unified Diff: ash/system/tray_update.cc

Issue 11415014: Stop using shell::GetInstance()->system_tray() in system tray items (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix single-letter typo :(. Created 8 years, 1 month 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/tray_update.h ('k') | ash/system/user/tray_user.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray_update.cc
diff --git a/ash/system/tray_update.cc b/ash/system/tray_update.cc
index 2e0e97dd146424d5c3a1e0e7f5202f87930e3f98..ef352ebc11e43376a6468e01d672c73d609e94b2 100644
--- a/ash/system/tray_update.cc
+++ b/ash/system/tray_update.cc
@@ -102,7 +102,7 @@ class UpdateNagger : public ui::LayerAnimationObserver {
explicit UpdateNagger(SystemTrayItem* owner)
: owner_(owner) {
RestartTimer();
- Shell::GetInstance()->system_tray()->GetWidget()->GetNativeView()->layer()->
+ owner_->system_tray()->GetWidget()->GetNativeView()->layer()->
GetAnimator()->AddObserver(this);
}
@@ -153,8 +153,8 @@ class UpdateNagger : public ui::LayerAnimationObserver {
} // namespace tray
-TrayUpdate::TrayUpdate()
- : TrayImageItem(IDR_AURA_UBER_TRAY_UPDATE),
+TrayUpdate::TrayUpdate(SystemTray* system_tray)
+ : TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_UPDATE),
severity_(UpdateObserver::UPDATE_NORMAL) {
}
« no previous file with comments | « ash/system/tray_update.h ('k') | ash/system/user/tray_user.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698