| 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..144747c68846161cadfc6db239a1c52920aa5dae 100644
|
| --- a/ash/app_list/app_list_presenter_delegate.cc
|
| +++ b/ash/app_list/app_list_presenter_delegate.cc
|
| @@ -99,11 +99,15 @@ 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,
|
| + ash::ScreenUtil::GetDisplayWorkAreaBoundsInParent(container));
|
| +
|
| + if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + app_list::switches::kEnableFullscreenAppList)) {
|
| + view->MaybeSetAnchorPoint(GetCenterOfDisplayForWindow(
|
| + wm_root_window, GetMinimumBoundsHeightForAppList(view)));
|
| + }
|
| keyboard::KeyboardController* keyboard_controller =
|
| keyboard::KeyboardController::GetInstance();
|
| if (keyboard_controller)
|
| @@ -148,7 +152,7 @@ void AppListPresenterDelegate::UpdateBounds() {
|
| return;
|
|
|
| view_->UpdateBounds();
|
| - view_->SetAnchorPoint(GetCenterOfDisplayForWindow(
|
| + view_->MaybeSetAnchorPoint(GetCenterOfDisplayForWindow(
|
| WmWindow::Get(view_->GetWidget()->GetNativeWindow()),
|
| GetMinimumBoundsHeightForAppList(view_)));
|
| }
|
|
|