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

Unified Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Issue 11476033: [Launcher per display] Removed Shell::status_area_widget(), system_tray() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix style Created 8 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 | « chrome/browser/chromeos/login/webui_login_view.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/system/ash_system_tray_delegate.cc
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
index faab7052a730ede2346ed8f5800e12f872ebe051..258573f12a0e6b698526e6cd1af8cb3403b74b97 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -763,8 +763,8 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
}
private:
- ash::SystemTray* GetSystemTray() {
- return ash::Shell::GetInstance()->system_tray();
+ ash::SystemTray* GetPrimarySystemTray() {
+ return ash::Shell::GetInstance()->GetPrimarySystemTray();
}
ash::SystemTrayNotifier* GetSystemTrayNotifier() {
@@ -992,7 +992,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
RefreshNetworkObserver(crosnet);
RefreshNetworkDeviceObserver(crosnet);
data_promo_notification_->ShowOptionalMobileDataPromoNotification(
- crosnet, GetSystemTray(), this);
+ crosnet, GetPrimarySystemTray(), this);
NotifyRefreshNetwork();
}
« no previous file with comments | « chrome/browser/chromeos/login/webui_login_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698