diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 07:11:01 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 07:11:01 +0000 |
| commit | 88d7112796be37d4e1feb0015cfe95c6f39f303c (patch) | |
| tree | c623905eddba657b6075acb4644259e07b3ef696 /ash/system/web_notification | |
| parent | fe217945ffdce156b66be335271301555704cdf8 (diff) | |
| download | chromium_src-88d7112796be37d4e1feb0015cfe95c6f39f303c.zip chromium_src-88d7112796be37d4e1feb0015cfe95c6f39f303c.tar.gz chromium_src-88d7112796be37d4e1feb0015cfe95c6f39f303c.tar.bz2 | |
Remove Shell::shelf|status_area_widget|launcher and
updated all clients to use one on RootWindowController and/or
Launcher::ForPrimaryDisplay/ForWindow.
BUG=145978
Review URL: https://chromiumcodereview.appspot.com/11017079
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162664 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/web_notification')
| -rw-r--r-- | ash/system/web_notification/web_notification_tray.cc | 4 | ||||
| -rw-r--r-- | ash/system/web_notification/web_notification_tray_unittest.cc | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc index b904c33..baf9f01 100644 --- a/ash/system/web_notification/web_notification_tray.cc +++ b/ash/system/web_notification/web_notification_tray.cc @@ -138,7 +138,7 @@ void WebNotificationTray::ShowMessageCenterBubble() { HidePopupBubble(); message_center_bubble_.reset(new MessageCenterBubble(this)); status_area_widget()->SetHideSystemNotifications(true); - Shell::GetInstance()->shelf()->UpdateAutoHideState(); + GetShelfLayoutManager()->UpdateAutoHideState(); } void WebNotificationTray::HideMessageCenterBubble() { @@ -149,7 +149,7 @@ void WebNotificationTray::HideMessageCenterBubble() { notification_list_->SetMessageCenterVisible(false); UpdateTray(); status_area_widget()->SetHideSystemNotifications(false); - Shell::GetInstance()->shelf()->UpdateAutoHideState(); + GetShelfLayoutManager()->UpdateAutoHideState(); } void WebNotificationTray::SetHidePopupBubble(bool hide) { diff --git a/ash/system/web_notification/web_notification_tray_unittest.cc b/ash/system/web_notification/web_notification_tray_unittest.cc index 3ac88a8..0de2575 100644 --- a/ash/system/web_notification/web_notification_tray_unittest.cc +++ b/ash/system/web_notification/web_notification_tray_unittest.cc @@ -6,6 +6,7 @@ #include <vector> +#include "ash/root_window_controller.h" #include "ash/system/status_area_widget.h" #include "ash/system/tray/system_tray_item.h" #include "ash/test/ash_test_base.h" @@ -21,7 +22,8 @@ namespace ash { namespace { WebNotificationTray* GetWebNotificationTray() { - return Shell::GetInstance()->status_area_widget()->web_notification_tray(); + return Shell::GetPrimaryRootWindowController()->status_area_widget()-> + web_notification_tray(); } class TestDelegate : public WebNotificationTray::Delegate { |