| Index: chrome/browser/ui/app_list/app_list_view_delegate.cc
|
| diff --git a/chrome/browser/ui/app_list/app_list_view_delegate.cc b/chrome/browser/ui/app_list/app_list_view_delegate.cc
|
| index 4627efcc9648850013a6a5d499c8c4c6363f393a..e85b9827ab2d119c21d022e37a8dfe4b37db3af6 100644
|
| --- a/chrome/browser/ui/app_list/app_list_view_delegate.cc
|
| +++ b/chrome/browser/ui/app_list/app_list_view_delegate.cc
|
| @@ -45,6 +45,8 @@
|
| #endif
|
|
|
| #if defined(USE_ASH)
|
| +#include "ash/shell.h"
|
| +#include "ash/wm/maximize_mode/maximize_mode_controller.h"
|
| #include "chrome/browser/ui/ash/app_list/app_sync_ui_state_watcher.h"
|
| #endif
|
|
|
| @@ -429,6 +431,19 @@ bool AppListViewDelegate::ShouldCenterWindow() const {
|
| return true;
|
| #endif
|
|
|
| +#if defined(USE_ASH)
|
| + // If it is at all possible to enter maximize mode in this configuration
|
| + // (which has a virtual keyboard), we should use the experimental position.
|
| + // This avoids having the app list change shape and position as the user
|
| + // enters and exits maximize mode.
|
| + if (ash::Shell::HasInstance() &&
|
| + ash::Shell::GetInstance()
|
| + ->maximize_mode_controller()
|
| + ->CanEnterMaximizeMode()) {
|
| + return true;
|
| + }
|
| +#endif
|
| +
|
| return false;
|
| }
|
|
|
|
|