summaryrefslogtreecommitdiffstats
path: root/ash/system/tray_update.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-10 22:57:09 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-10 22:57:09 +0000
commita0afeb1aafd479aed625b2a6c6e0fc02b5348962 (patch)
tree5a69548fe6278196c3dc69bfb1758cfa01444057 /ash/system/tray_update.cc
parent6d6587c3b5f3d1a3a5b7b03272c957a44d6acc71 (diff)
downloadchromium_src-a0afeb1aafd479aed625b2a6c6e0fc02b5348962.zip
chromium_src-a0afeb1aafd479aed625b2a6c6e0fc02b5348962.tar.gz
chromium_src-a0afeb1aafd479aed625b2a6c6e0fc02b5348962.tar.bz2
[Launcher per display] Removed Shell::status_area_widget(), system_tray()
HasPrimaryStatusArea/GetPrimarySystemTray for login screen which will have only one tray/status area on primary BUG=145978 TEST=none Review URL: https://chromiumcodereview.appspot.com/11476033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172169 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/tray_update.cc')
-rw-r--r--ash/system/tray_update.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/system/tray_update.cc b/ash/system/tray_update.cc
index ef352eb..67aa2b3 100644
--- a/ash/system/tray_update.cc
+++ b/ash/system/tray_update.cc
@@ -108,7 +108,7 @@ class UpdateNagger : public ui::LayerAnimationObserver {
virtual ~UpdateNagger() {
internal::StatusAreaWidget* status_area =
- ash::Shell::GetInstance()->status_area_widget();
+ Shell::GetPrimaryRootWindowController()->status_area_widget();
if (status_area) {
status_area->system_tray()->GetWidget()->GetNativeView()->layer()->
GetAnimator()->RemoveObserver(this);