Use centered app list position whenever virtual keyboard is enabled.

chrome/browser/ui/app_list/app_list_view_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/app_list/app_list_view_delegate.h"
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
@@ skipping 16 matching lines @@
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/url_constants.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/user_metrics.h"
 #include "grit/theme_resources.h"
+#include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/app_list_view_delegate_observer.h"
 #include "ui/app_list/search_box_model.h"
 #include "ui/app_list/speech_ui_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/geometry/rect.h"
 
 #if defined(USE_AURA)
 #include "ui/keyboard/keyboard_controller.h"
+#include "ui/keyboard/keyboard_util.h"
 #endif
 
 #if defined(USE_ASH)
 #include "chrome/browser/ui/ash/app_list/app_sync_ui_state_watcher.h"
 #endif
 
 #if defined(OS_WIN)
 #include "chrome/browser/web_applications/web_app_win.h"
 #endif
 
@@ skipping 355 matching lines @@
     return NULL;
 
   return service->GetSpeechRecognitionContents();
 }
 
 const app_list::AppListViewDelegate::Users&
 AppListViewDelegate::GetUsers() const {
   return users_;
 }
 
+bool AppListViewDelegate::UseExperimentalAppListPosition() const {
+  if (app_list::switches::IsExperimentalAppListPositionEnabled())
+    return true;
+
+  // keyboard depends upon Aura.
+#if defined(USE_AURA)
+  // If the virtual keyboard is enabled, use the new app list position. The old
+  // position is too tall, and doesn't fit in the left-over screen space.
+  if (keyboard::IsKeyboardEnabled())
+    return true;
+#endif
+
+  return false;
+}
+
 gfx::Rect AppListViewDelegate::GetVirtualKeyboardBounds() const {
   // KeyboardController depends upon Aura.
 #if defined(USE_AURA)
   keyboard::KeyboardController* keyboard_controller =
       keyboard::KeyboardController::GetInstance();
   if (!keyboard_controller || !keyboard_controller->keyboard_visible())
     return gfx::Rect();
   return keyboard_controller->current_keyboard_bounds();
 #else
   return gfx::Rect();
 #endif
 }
 
 void AppListViewDelegate::AddObserver(
     app_list::AppListViewDelegateObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void AppListViewDelegate::RemoveObserver(
     app_list::AppListViewDelegateObserver* observer) {
   observers_.RemoveObserver(observer);
 }