[VK] Move ShouldWindowOverscroll to be private on ChromeKeyboardUI.
The base class KeyboardUI doesn't call ShouldWindowOverscroll, so it
doesn't really need to be on the base class. ShouldWindowOverscroll
is only used by ChromeKeyboardUI, so we just move it to be a private
method on that class.
TBR=yhanada@chromium.org
Change-Id: I5b95c83d64f6e2d8d2c8d50ac42bb34416a06aaa
Reviewed-on: https://chromium-review.googlesource.com/1150014
Reviewed-by: Darren Shen <shend@chromium.org>
Commit-Queue: Darren Shen <shend@chromium.org>
Cr-Commit-Position: refs/heads/master@{#578137}diff --git a/ash/keyboard/test_keyboard_ui.cc b/ash/keyboard/test_keyboard_ui.cc
index 0b457a2..a665ef29 100644
--- a/ash/keyboard/test_keyboard_ui.cc
+++ b/ash/keyboard/test_keyboard_ui.cc
@@ -19,10 +19,6 @@
return !!keyboard_window_;
}
-bool TestKeyboardUI::ShouldWindowOverscroll(aura::Window* window) const {
- return true;
-}
-
aura::Window* TestKeyboardUI::GetKeyboardWindow() {
if (!keyboard_window_) {
keyboard_window_.reset(new aura::Window(&delegate_));
diff --git a/ash/keyboard/test_keyboard_ui.h b/ash/keyboard/test_keyboard_ui.h
index 250e15e..92bb278 100644
--- a/ash/keyboard/test_keyboard_ui.h
+++ b/ash/keyboard/test_keyboard_ui.h
@@ -24,7 +24,6 @@
~TestKeyboardUI() override;
bool HasKeyboardWindow() const override;
- bool ShouldWindowOverscroll(aura::Window* window) const override;
aura::Window* GetKeyboardWindow() override;
private:
diff --git a/chrome/browser/ui/ash/chrome_keyboard_ui.h b/chrome/browser/ui/ash/chrome_keyboard_ui.h
index 3ff7e37..18f10f8 100644
--- a/chrome/browser/ui/ash/chrome_keyboard_ui.h
+++ b/chrome/browser/ui/ash/chrome_keyboard_ui.h
@@ -62,7 +62,6 @@
// Overridden from KeyboardUI:
aura::Window* GetKeyboardWindow() override;
bool HasKeyboardWindow() const override;
- bool ShouldWindowOverscroll(aura::Window* window) const override;
void ReloadKeyboardIfNeeded() override;
void InitInsets(const gfx::Rect& new_bounds) override;
void ResetInsets() override;
@@ -95,6 +94,11 @@
// Determines whether a particular window should have insets for overscroll.
bool ShouldEnableInsets(aura::Window* window);
+ // Whether this window should do an overscroll to avoid occlusion by the
+ // virtual keyboard. IME windows and virtual keyboard windows should always
+ // avoid overscroll.
+ bool ShouldWindowOverscroll(aura::Window* window) const;
+
// Adds an observer for tracking changes to a window size or
// position while the keyboard is displayed. Any window repositioning
// invalidates insets for overscrolling.
diff --git a/ui/keyboard/keyboard_ui.h b/ui/keyboard/keyboard_ui.h
index b1f08fa..08fc72a 100644
--- a/ui/keyboard/keyboard_ui.h
+++ b/ui/keyboard/keyboard_ui.h
@@ -38,11 +38,6 @@
// Whether the keyboard window has been created.
virtual bool HasKeyboardWindow() const = 0;
- // Whether this window should do an overscroll to avoid occlusion by the
- // virtual keyboard. IME windows and virtual keyboard windows should always
- // avoid overscroll.
- virtual bool ShouldWindowOverscroll(aura::Window* window) const = 0;
-
// Gets the InputMethod that will provide notifications about changes in the
// text input context.
virtual ui::InputMethod* GetInputMethod() = 0;
diff --git a/ui/keyboard/test/keyboard_test_util.cc b/ui/keyboard/test/keyboard_test_util.cc
index 9a0afe9..7aec1d5c 100644
--- a/ui/keyboard/test/keyboard_test_util.cc
+++ b/ui/keyboard/test/keyboard_test_util.cc
@@ -119,8 +119,4 @@
return !!window_;
}
-bool TestKeyboardUI::ShouldWindowOverscroll(aura::Window* window) const {
- return true;
-}
-
} // namespace keyboard
diff --git a/ui/keyboard/test/keyboard_test_util.h b/ui/keyboard/test/keyboard_test_util.h
index 5716952..7a638b0 100644
--- a/ui/keyboard/test/keyboard_test_util.h
+++ b/ui/keyboard/test/keyboard_test_util.h
@@ -40,7 +40,6 @@
// Overridden from KeyboardUI:
bool HasKeyboardWindow() const override;
- bool ShouldWindowOverscroll(aura::Window* window) const override;
aura::Window* GetKeyboardWindow() override;
ui::InputMethod* GetInputMethod() override;
void ReloadKeyboardIfNeeded() override {}
