From 39e9521b57d2badebea576e14fe8c901e02992fa Mon Sep 17 00:00:00 2001 From: "bshe@chromium.org" Date: Wed, 23 Apr 2014 20:00:01 +0000 Subject: Currently, we try to set virtual keyboard window height both in native code and in VK's javascript code through window.resizeTo It sometimes creates conflict and cause strange animation issues. In this CL, the window height logic in native side is removed. The default window height is set to 0 and we expect javascript will set the window to correct height. If window is resized from a non zero height to another non zeor height, we current dont do any animation. BUG=363622 Review URL: https://codereview.chromium.org/240443006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265712 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/keyboard/keyboard_controller_proxy.h | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'ui/keyboard/keyboard_controller_proxy.h') diff --git a/ui/keyboard/keyboard_controller_proxy.h b/ui/keyboard/keyboard_controller_proxy.h index f05f6f2..0884cd9 100644 --- a/ui/keyboard/keyboard_controller_proxy.h +++ b/ui/keyboard/keyboard_controller_proxy.h @@ -52,19 +52,10 @@ class KEYBOARD_EXPORT KeyboardControllerProxy { // with the proxy. virtual aura::Window* GetKeyboardWindow(); - // Whether the keyboard window is resizing from its web contents. - bool resizing_from_contents() const { return resizing_from_contents_; } - // Whether the keyboard window is created. The keyboard window is tied to a // WebContent so we can just check if the WebContent is created or not. virtual bool HasKeyboardWindow() const; - // Sets the flag of whether the keyboard window is resizing from - // its web contents. - void set_resizing_from_contents(bool resizing) { - resizing_from_contents_ = resizing; - } - // Gets the InputMethod that will provide notifications about changes in the // text input context. virtual ui::InputMethod* GetInputMethod() = 0; @@ -130,9 +121,6 @@ class KEYBOARD_EXPORT KeyboardControllerProxy { scoped_ptr keyboard_contents_; - // Whether the current keyboard window is resizing from its web content. - bool resizing_from_contents_; - DISALLOW_COPY_AND_ASSIGN(KeyboardControllerProxy); }; -- cgit v1.1