Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Unified Diff: ash/app_list/app_list_presenter_delegate.cc

Issue 2938203004: Revert of Added HALF, FULLSCREEN_ALL_APPS, and FULLSCREEN_SEARCH. (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/app_list/app_list_presenter_delegate.h ('k') | ash/app_list/app_list_presenter_delegate_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « ash/app_list/app_list_presenter_delegate.h ('k') | ash/app_list/app_list_presenter_delegate_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698