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

Unified Diff: ash/system/web_notification/web_notification_tray.cc

Issue 115113006: Rename Launcher to Shelf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixes Created 7 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 | « ash/system/web_notification/web_notification_tray.h ('k') | ash/test/launcher_test_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
}
« no previous file with comments | « ash/system/web_notification/web_notification_tray.h ('k') | ash/test/launcher_test_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698