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

Unified Diff: chrome/browser/ui/app_list/app_list_view_delegate.cc

Issue 250423004: ChromeOS: Avoid overlapping app list with virtual keyboard. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Avoid DEPS changes; use AppListViewDelegate instead. Created 6 years, 8 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: 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 e9c2a506db15c089ce73fac5ff2b413ec42bd218..291a581d7257642812cd0d37f16dea5eb92315a7 100644
--- a/chrome/browser/ui/app_list/app_list_view_delegate.cc
+++ b/chrome/browser/ui/app_list/app_list_view_delegate.cc
@@ -38,6 +38,8 @@
#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"
+#include "ui/keyboard/keyboard_controller.h"
#if defined(USE_ASH)
#include "chrome/browser/ui/ash/app_list/app_sync_ui_state_watcher.h"
@@ -412,6 +414,14 @@ AppListViewDelegate::GetUsers() const {
return users_;
}
+gfx::Rect AppListViewDelegate::GetVirtualKeyboardBounds() const {
+ keyboard::KeyboardController* keyboard_controller =
+ keyboard::KeyboardController::GetInstance();
tapted 2014/04/29 06:09:53 I think you'll need to guard this in a USE_ASH or
Matt Giuca 2014/04/29 06:26:11 I thought you originally told me not to have USE_A
+ if (!keyboard_controller || !keyboard_controller->keyboard_visible())
+ return gfx::Rect();
+ return keyboard_controller->current_keyboard_bounds();
+}
+
void AppListViewDelegate::AddObserver(
app_list::AppListViewDelegateObserver* observer) {
observers_.AddObserver(observer);

Powered by Google App Engine
This is Rietveld 408576698