| Index: ash/app_list/app_list_presenter_delegate.cc
|
| diff --git a/ash/app_list/app_list_presenter_delegate.cc b/ash/app_list/app_list_presenter_delegate.cc
|
| index 7c79ec5e516cb989db79e4596a865db53344447d..c2692f5be15e003c26ab9f30b47f8bb38e588316 100644
|
| --- a/ash/app_list/app_list_presenter_delegate.cc
|
| +++ b/ash/app_list/app_list_presenter_delegate.cc
|
| @@ -51,12 +51,12 @@ views::BubbleBorder::Arrow GetBubbleArrow(aura::Window* window) {
|
| gfx::Vector2d GetAnchorPositionOffsetToShelf(const gfx::Rect& button_bounds,
|
| views::Widget* widget) {
|
| DCHECK(Shell::HasInstance());
|
| - ShelfAlignment shelf_alignment =
|
| + wm::ShelfAlignment shelf_alignment =
|
| Shelf::ForWindow(widget->GetNativeView()->GetRootWindow())->alignment();
|
| gfx::Point anchor(button_bounds.CenterPoint());
|
| switch (shelf_alignment) {
|
| - case SHELF_ALIGNMENT_BOTTOM:
|
| - case SHELF_ALIGNMENT_BOTTOM_LOCKED:
|
| + case wm::SHELF_ALIGNMENT_BOTTOM:
|
| + case wm::SHELF_ALIGNMENT_BOTTOM_LOCKED:
|
| if (base::i18n::IsRTL()) {
|
| int screen_width = widget->GetWorkAreaBoundsInScreen().width();
|
| return gfx::Vector2d(
|
| @@ -66,10 +66,10 @@ gfx::Vector2d GetAnchorPositionOffsetToShelf(const gfx::Rect& button_bounds,
|
| }
|
| return gfx::Vector2d(
|
| std::max(kMinimalAnchorPositionOffset - anchor.x(), 0), 0);
|
| - case SHELF_ALIGNMENT_LEFT:
|
| + case wm::SHELF_ALIGNMENT_LEFT:
|
| return gfx::Vector2d(
|
| 0, std::max(kMinimalAnchorPositionOffset - anchor.y(), 0));
|
| - case SHELF_ALIGNMENT_RIGHT:
|
| + case wm::SHELF_ALIGNMENT_RIGHT:
|
| return gfx::Vector2d(
|
| 0, std::max(kMinimalAnchorPositionOffset - anchor.y(), 0));
|
| }
|
|
|