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

Unified Diff: ui/keyboard/keyboard_controller.cc

Issue 195793004: Implement overscroll support for the virtual keyboard. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix copyright notice. Created 6 years, 9 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: ui/keyboard/keyboard_controller.cc
diff --git a/ui/keyboard/keyboard_controller.cc b/ui/keyboard/keyboard_controller.cc
index 95966147d89644c492af6be9e47eb5131752115f..0ae1285286a11cc3b3af5aedfbced9ecbcd5c056 100644
--- a/ui/keyboard/keyboard_controller.cc
+++ b/ui/keyboard/keyboard_controller.cc
@@ -6,6 +6,8 @@
#include "base/bind.h"
#include "base/command_line.h"
+#include "ui/aura/client/virtual_keyboard_observer.h"
+#include "ui/aura/layout_manager.h"
#include "ui/aura/window.h"
#include "ui/aura/window_delegate.h"
#include "ui/base/cursor/cursor.h"
@@ -17,7 +19,6 @@
#include "ui/gfx/path.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/skia_util.h"
-#include "ui/keyboard/keyboard_controller_observer.h"
#include "ui/keyboard/keyboard_controller_proxy.h"
#include "ui/keyboard/keyboard_layout_manager.h"
#include "ui/keyboard/keyboard_switches.h"
@@ -217,7 +218,7 @@ aura::Window* KeyboardController::GetContainerWindow() {
void KeyboardController::NotifyKeyboardBoundsChanging(
const gfx::Rect& new_bounds) {
if (proxy_->HasKeyboardWindow() && proxy_->GetKeyboardWindow()->IsVisible()) {
- FOR_EACH_OBSERVER(KeyboardControllerObserver,
+ FOR_EACH_OBSERVER(aura::client::VirtualKeyboardObserver,
observer_list_,
OnKeyboardBoundsChanging(new_bounds));
}
@@ -253,14 +254,20 @@ void KeyboardController::HideKeyboard(HideReason reason) {
container_->layer()->SetOpacity(kAnimationStartOrAfterHideOpacity);
}
-void KeyboardController::AddObserver(KeyboardControllerObserver* observer) {
+void KeyboardController::AddObserver(
+ aura::client::VirtualKeyboardObserver* observer) {
observer_list_.AddObserver(observer);
}
-void KeyboardController::RemoveObserver(KeyboardControllerObserver* observer) {
+void KeyboardController::RemoveObserver(
+ aura::client::VirtualKeyboardObserver* observer) {
observer_list_.RemoveObserver(observer);
}
+bool KeyboardController::IsOverscrollEnabled() {
+ return keyboard::IsKeyboardOverscrollEnabled();
+}
+
void KeyboardController::ShowAndLockKeyboard() {
set_lock_keyboard(true);
OnShowImeIfNeeded();

Powered by Google App Engine
This is Rietveld 408576698