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

Unified Diff: ash/shelf/overflow_bubble_view.cc

Issue 115113006: Rename Launcher to Shelf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ShelfTestAPI 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
Index: ash/shelf/overflow_bubble_view.cc
diff --git a/ash/shelf/overflow_bubble_view.cc b/ash/shelf/overflow_bubble_view.cc
index 67b483de9cb0f1aff823e15622510cd5b8026d4e..51bb78cbb0ce202fd8f191379a334fa95d7b6b6d 100644
--- a/ash/shelf/overflow_bubble_view.cc
+++ b/ash/shelf/overflow_bubble_view.cc
@@ -42,7 +42,7 @@ OverflowBubbleView::~OverflowBubbleView() {
void OverflowBubbleView::InitOverflowBubble(views::View* anchor,
ShelfView* shelf_view) {
- // set_anchor_view needs to be called before GetShelfLayoutManagerForLauncher
+ // set_anchor_view needs to be called before GetShelfLayoutManagerForShelf
// can be called.
SetAnchorView(anchor);
set_arrow(GetBubbleArrow());
@@ -69,7 +69,7 @@ void OverflowBubbleView::InitOverflowBubble(views::View* anchor,
}
bool OverflowBubbleView::IsHorizontalAlignment() const {
- ShelfLayoutManager* shelf_layout_manager = GetShelfLayoutManagerForLauncher();
+ ShelfLayoutManager* shelf_layout_manager = GetShelfLayoutManagerForShelf();
return shelf_layout_manager ?
shelf_layout_manager->IsHorizontalAlignment() :
false;
@@ -81,7 +81,7 @@ const gfx::Size OverflowBubbleView::GetContentsSize() const {
// Gets arrow location based on shelf alignment.
views::BubbleBorder::Arrow OverflowBubbleView::GetBubbleArrow() const {
- ShelfLayoutManager* shelf_layout_manager = GetShelfLayoutManagerForLauncher();
+ ShelfLayoutManager* shelf_layout_manager = GetShelfLayoutManagerForShelf();
return shelf_layout_manager ?
shelf_layout_manager->SelectValueForShelfAlignment(
views::BubbleBorder::BOTTOM_LEFT,
@@ -166,9 +166,9 @@ bool OverflowBubbleView::OnMouseWheel(const ui::MouseWheelEvent& event) {
}
ShelfLayoutManager*
-OverflowBubbleView::GetShelfLayoutManagerForLauncher() const {
+OverflowBubbleView::GetShelfLayoutManagerForShelf() const {
return GetAnchorView() ?
- ShelfLayoutManager::ForLauncher(
+ ShelfLayoutManager::ForShelf(
GetAnchorView()->GetWidget()->GetNativeView()) :
NULL;
}

Powered by Google App Engine
This is Rietveld 408576698