| 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 16eae26ef31805ce430f469e5fec43a86012cb6b..fc81a0ab465a3c04fea5fb455ba19c0594ed625a 100644
|
| --- a/ash/app_list/app_list_presenter_delegate.cc
|
| +++ b/ash/app_list/app_list_presenter_delegate.cc
|
| @@ -58,19 +58,6 @@
|
| return bounds.CenterPoint();
|
| }
|
|
|
| -// Whether the shelf is oriented on the side, not on the bottom.
|
| -bool IsSideShelf(aura::Window* root_window) {
|
| - Shelf* shelf = Shelf::ForWindow(root_window);
|
| - switch (shelf->alignment()) {
|
| - case SHELF_ALIGNMENT_BOTTOM:
|
| - case SHELF_ALIGNMENT_BOTTOM_LOCKED:
|
| - return false;
|
| - case SHELF_ALIGNMENT_LEFT:
|
| - case SHELF_ALIGNMENT_RIGHT:
|
| - return true;
|
| - }
|
| -}
|
| -
|
| } // namespace
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| @@ -111,11 +98,7 @@
|
| aura::Window* container = RootWindowController::ForWindow(root_window)
|
| ->GetContainer(kShellWindowId_AppListContainer);
|
|
|
| - view->Initialize(container, current_apps_page,
|
| - Shell::Get()
|
| - ->maximize_mode_controller()
|
| - ->IsMaximizeModeWindowManagerEnabled(),
|
| - IsSideShelf(root_window));
|
| + view->Initialize(container, current_apps_page);
|
|
|
| if (!app_list::features::IsFullscreenAppListEnabled()) {
|
| view->MaybeSetAnchorPoint(GetCenterOfDisplayForWindow(
|
| @@ -246,18 +229,4 @@
|
| presenter_->Dismiss();
|
| }
|
|
|
| -void AppListPresenterDelegate::OnMaximizeModeStarted() {
|
| - if (!app_list::features::IsFullscreenAppListEnabled())
|
| - return;
|
| -
|
| - view_->OnMaximizeModeChanged(true);
|
| -}
|
| -
|
| -void AppListPresenterDelegate::OnMaximizeModeEnded() {
|
| - if (!app_list::features::IsFullscreenAppListEnabled())
|
| - return;
|
| -
|
| - view_->OnMaximizeModeChanged(false);
|
| -}
|
| -
|
| } // namespace ash
|
|
|