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

Unified Diff: ash/system/tray/system_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/tray/system_tray.h ('k') | ash/system/tray/system_tray_bubble.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/system_tray.cc
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index cee88472837d7930d5fb8a47e11f97a513d3b16f..48d90c51e27781aa5d960d0c9b8ad996a2ae4d34 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -342,8 +342,8 @@ void SystemTray::SetHideNotifications(bool hide_notifications) {
hide_notifications_ = hide_notifications;
}
-bool SystemTray::ShouldShowLauncher() const {
- return system_bubble_.get() && system_bubble_->bubble()->ShouldShowLauncher();
+bool SystemTray::ShouldShowShelf() const {
+ return system_bubble_.get() && system_bubble_->bubble()->ShouldShowShelf();
}
bool SystemTray::HasSystemBubble() const {
@@ -618,7 +618,7 @@ void SystemTray::SetShelfAlignment(ShelfAlignment alignment) {
void SystemTray::AnchorUpdated() {
if (notification_bubble_) {
notification_bubble_->bubble_view()->UpdateBubble();
- // Ensure that the notification buble is above the launcher/status area.
+ // Ensure that the notification buble is above the shelf/status area.
notification_bubble_->bubble_view()->GetWidget()->StackAtTop();
UpdateBubbleViewArrow(notification_bubble_->bubble_view());
}
« no previous file with comments | « ash/system/tray/system_tray.h ('k') | ash/system/tray/system_tray_bubble.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698