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

Unified Diff: ash/system/tray/tray_background_view.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_item.cc ('k') | ash/system/web_notification/web_notification_tray.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/tray_background_view.cc
diff --git a/ash/system/tray/tray_background_view.cc b/ash/system/tray/tray_background_view.cc
index 80cac07e364527d1f6e5e3ff1347b7511c9a63b6..952f622d27124d3fb0958e0798ca3a1c516dc86f 100644
--- a/ash/system/tray/tray_background_view.cc
+++ b/ash/system/tray/tray_background_view.cc
@@ -429,7 +429,7 @@ void TrayBackgroundView::SetContentsBackground() {
}
ShelfLayoutManager* TrayBackgroundView::GetShelfLayoutManager() {
- return ShelfLayoutManager::ForLauncher(GetWidget()->GetNativeView());
+ return ShelfLayoutManager::ForShelf(GetWidget()->GetNativeView());
}
void TrayBackgroundView::SetShelfAlignment(ShelfAlignment alignment) {
@@ -623,7 +623,7 @@ void TrayBackgroundView::UpdateBubbleViewArrow(
aura::Window* root_window =
bubble_view->GetWidget()->GetNativeView()->GetRootWindow();
ash::internal::ShelfLayoutManager* shelf =
- ShelfLayoutManager::ForLauncher(root_window);
+ ShelfLayoutManager::ForShelf(root_window);
bubble_view->SetArrowPaintType(
(shelf && shelf->IsVisible()) ?
views::BubbleBorder::PAINT_NORMAL :
« no previous file with comments | « ash/system/tray/system_tray_item.cc ('k') | ash/system/web_notification/web_notification_tray.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698