| Index: ash/shelf/overflow_button.cc
|
| diff --git a/ash/shelf/overflow_button.cc b/ash/shelf/overflow_button.cc
|
| index 4f8becc52f7d7877e756cff984a8387bee5334e9..52fa36a8f092f2e924fce236542dd56a8903dc6e 100644
|
| --- a/ash/shelf/overflow_button.cc
|
| +++ b/ash/shelf/overflow_button.cc
|
| @@ -57,7 +57,7 @@ void OverflowButton::PaintBackground(gfx::Canvas* canvas, int alpha) {
|
| gfx::Rect bounds(GetContentsBounds());
|
| gfx::Rect rect(0, 0, kButtonHoverSize, kButtonHoverSize);
|
| ShelfLayoutManager* shelf =
|
| - ShelfLayoutManager::ForLauncher(GetWidget()->GetNativeView());
|
| + ShelfLayoutManager::ForShelf(GetWidget()->GetNativeView());
|
|
|
| // Nudge the background a little to line up right.
|
| if (shelf->IsHorizontalAlignment()) {
|
| @@ -85,15 +85,15 @@ void OverflowButton::PaintBackground(gfx::Canvas* canvas, int alpha) {
|
| }
|
|
|
| void OverflowButton::OnPaint(gfx::Canvas* canvas) {
|
| - ShelfLayoutManager* layout_manager = ShelfLayoutManager::ForLauncher(
|
| - GetWidget()->GetNativeView());
|
| + ShelfLayoutManager* layout_manager =
|
| + ShelfLayoutManager::ForShelf(GetWidget()->GetNativeView());
|
| ShelfAlignment alignment = layout_manager->GetAlignment();
|
|
|
| gfx::Rect bounds(GetContentsBounds());
|
| if (ash::switches::UseAlternateShelfLayout()) {
|
| ResourceBundle& rb = ResourceBundle::GetSharedInstance();
|
| int background_image_id = 0;
|
| - if (layout_manager->shelf_widget()->launcher()->IsShowingOverflowBubble())
|
| + if (layout_manager->shelf_widget()->shelf()->IsShowingOverflowBubble())
|
| background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_PRESSED;
|
| else if(layout_manager->shelf_widget()->GetDimsShelf())
|
| background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_ON_BLACK;
|
|
|