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

Unified Diff: ash/system/status_area_widget.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/status_area_widget.h ('k') | ash/system/tray/system_tray.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/status_area_widget.cc
diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc
index 19649b1731d95fda2492050e3a706fe59ae2bb2b..305dab80eaba79c9a10d1c68000cc1576891d3d7 100644
--- a/ash/system/status_area_widget.cc
+++ b/ash/system/status_area_widget.cc
@@ -76,16 +76,16 @@ void StatusAreaWidget::Shutdown() {
system_tray_ = NULL;
}
-bool StatusAreaWidget::ShouldShowLauncher() const {
- if ((system_tray_ && system_tray_->ShouldShowLauncher()) ||
+bool StatusAreaWidget::ShouldShowShelf() const {
+ if ((system_tray_ && system_tray_->ShouldShowShelf()) ||
(web_notification_tray_ &&
- web_notification_tray_->ShouldBlockLauncherAutoHide()))
+ web_notification_tray_->ShouldBlockShelfAutoHide()))
return true;
- if (!RootWindowController::ForLauncher(GetNativeView())->shelf()->IsVisible())
+ if (!RootWindowController::ForShelf(GetNativeView())->shelf()->IsVisible())
return false;
- // If the launcher is currently visible, don't hide the launcher if the mouse
+ // If the shelf is currently visible, don't hide the shelf if the mouse
// is in any of the notification bubbles.
return (system_tray_ && system_tray_->IsMouseInNotificationBubble()) ||
(web_notification_tray_ &&
« no previous file with comments | « ash/system/status_area_widget.h ('k') | ash/system/tray/system_tray.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698