| Index: ash/system/web_notification/web_notification_tray.cc
|
| diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc
|
| index 1cbfbcadd56f6f891518c40ed6ef90300551f2cd..89c2deef1d8c4823b6da0ff5d6797c1188a59330 100644
|
| --- a/ash/system/web_notification/web_notification_tray.cc
|
| +++ b/ash/system/web_notification/web_notification_tray.cc
|
| @@ -195,7 +195,7 @@ void WorkAreaObserver::UpdateShelf() {
|
| if (shelf_)
|
| return;
|
|
|
| - shelf_ = ShelfLayoutManager::ForLauncher(root_window_);
|
| + shelf_ = ShelfLayoutManager::ForShelf(root_window_);
|
| if (shelf_)
|
| shelf_->AddObserver(this);
|
| }
|
| @@ -431,7 +431,7 @@ bool WebNotificationTray::ShouldShowMessageCenter() {
|
| status_area_widget()->system_tray()->HasNotificationBubble());
|
| }
|
|
|
| -bool WebNotificationTray::ShouldBlockLauncherAutoHide() const {
|
| +bool WebNotificationTray::ShouldBlockShelfAutoHide() const {
|
| return should_block_shelf_auto_hide_;
|
| }
|
|
|
|
|