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 dbc28e6e2237c28b47cc9a2fb335711877875c13..3a1f918c6985516d21f3133561efd7c1829855e3 100644 |
--- a/ash/app_list/app_list_presenter_delegate.cc |
+++ b/ash/app_list/app_list_presenter_delegate.cc |
@@ -99,11 +99,13 @@ void AppListPresenterDelegate::Init(app_list::AppListView* view, |
aura::Window* root_window = wm_root_window->aura_window(); |
aura::Window* container = GetRootWindowController(root_window) |
->GetContainer(kShellWindowId_AppListContainer); |
- view->InitAsBubble(container, current_apps_page); |
- // The app list is centered over the display. |
- view->SetAnchorPoint(GetCenterOfDisplayForWindow( |
- wm_root_window, GetMinimumBoundsHeightForAppList(view))); |
+ view->Initialize(container, current_apps_page); |
+ |
+ if (!app_list::switches::IsFullscreenAppListEnabled()) { |
+ view->MaybeSetAnchorPoint(GetCenterOfDisplayForWindow( |
+ wm_root_window, GetMinimumBoundsHeightForAppList(view))); |
+ } |
keyboard::KeyboardController* keyboard_controller = |
keyboard::KeyboardController::GetInstance(); |
if (keyboard_controller) |
@@ -148,7 +150,7 @@ void AppListPresenterDelegate::UpdateBounds() { |
return; |
view_->UpdateBounds(); |
- view_->SetAnchorPoint(GetCenterOfDisplayForWindow( |
+ view_->MaybeSetAnchorPoint(GetCenterOfDisplayForWindow( |
WmWindow::Get(view_->GetWidget()->GetNativeWindow()), |
GetMinimumBoundsHeightForAppList(view_))); |
} |