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

Unified Diff: ash/app_list/app_list_presenter_delegate.cc

Issue 2713603002: Remove fullscreen applist (Closed)
Patch Set: . Created 3 years, 10 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
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 2af25653fea478fddaa09537ac176b3736652229..41ee2d4392439e0a739b799b355cc886940f6971 100644
--- a/ash/app_list/app_list_presenter_delegate.cc
+++ b/ash/app_list/app_list_presenter_delegate.cc
@@ -59,11 +59,6 @@ gfx::Point GetCenterOfDisplayForWindow(WmWindow* window, int minimum_height) {
return bounds.CenterPoint();
}
-bool IsFullscreenAppListEnabled() {
- return base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kAshEnableFullscreenAppList);
-}
-
} // namespace
////////////////////////////////////////////////////////////////////////////////
@@ -107,20 +102,10 @@ void AppListPresenterDelegate::Init(app_list::AppListView* view,
WmWindow* wm_root_window = WmWindow::Get(root_window);
aura::Window* container = GetRootWindowController(root_window)
->GetContainer(kShellWindowId_AppListContainer);
- bool is_fullscreen = IsFullscreenAppListEnabled() &&
- WmShell::Get()
- ->maximize_mode_controller()
- ->IsMaximizeModeWindowManagerEnabled();
- if (is_fullscreen) {
- view->InitAsFramelessWindow(
- container, current_apps_page,
- ScreenUtil::GetDisplayWorkAreaBoundsInParent(container));
- } else {
- view->InitAsBubble(container, current_apps_page);
- // The app list is centered over the display.
- view->SetAnchorPoint(GetCenterOfDisplayForWindow(
- wm_root_window, GetMinimumBoundsHeightForAppList(view)));
- }
+ view->InitAsBubble(container, current_apps_page);
+ // The app list is centered over the display.
+ view->SetAnchorPoint(GetCenterOfDisplayForWindow(
+ wm_root_window, GetMinimumBoundsHeightForAppList(view)));
keyboard::KeyboardController* keyboard_controller =
keyboard::KeyboardController::GetInstance();
@@ -255,22 +240,6 @@ void AppListPresenterDelegate::OnOverviewModeStarting() {
presenter_->Dismiss();
}
-void AppListPresenterDelegate::OnMaximizeModeStarted() {
- // The "fullscreen" app-list is initialized as in a different type of window,
- // therefore we can't switch between the fullscreen status and the normal
- // app-list bubble. App-list should be dismissed for the transition between
- // maximize mode (touch-view mode) and non-maximize mode, otherwise the app
- // list tries to behave as a bubble which leads to a crash. crbug.com/510062
- if (IsFullscreenAppListEnabled() && is_visible_)
- presenter_->Dismiss();
-}
-
-void AppListPresenterDelegate::OnMaximizeModeEnded() {
- // See the comments of OnMaximizeModeStarted().
- if (IsFullscreenAppListEnabled() && is_visible_)
- presenter_->Dismiss();
-}
-
////////////////////////////////////////////////////////////////////////////////
// AppListPresenterDelegate, WmShelfObserver implementation:

Powered by Google App Engine
This is Rietveld 408576698