| 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 :
|
|
|