diff options
author | bshe <bshe@chromium.org> | 2015-06-11 08:22:53 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-06-11 15:24:42 +0000 |
commit | 22e68ea2da8caf496186e1fbac78a041015c80ef (patch) | |
tree | c0fa16d4300ee524c5df008d6eca110870c03b9b /ui/keyboard/keyboard_controller_proxy.h | |
parent | cfb044b18e1fc818972697478a238ab39c144148 (diff) | |
download | chromium_src-22e68ea2da8caf496186e1fbac78a041015c80ef.zip chromium_src-22e68ea2da8caf496186e1fbac78a041015c80ef.tar.gz chromium_src-22e68ea2da8caf496186e1fbac78a041015c80ef.tar.bz2 |
Fix centered vk when switch to a new extension while in floating mode
BUG=489366
Review URL: https://codereview.chromium.org/1167733002
Cr-Commit-Position: refs/heads/master@{#333954}
Diffstat (limited to 'ui/keyboard/keyboard_controller_proxy.h')
-rw-r--r-- | ui/keyboard/keyboard_controller_proxy.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/keyboard/keyboard_controller_proxy.h b/ui/keyboard/keyboard_controller_proxy.h index f927849..98051fa 100644 --- a/ui/keyboard/keyboard_controller_proxy.h +++ b/ui/keyboard/keyboard_controller_proxy.h @@ -106,7 +106,7 @@ class KEYBOARD_EXPORT KeyboardControllerProxy : public aura::WindowObserver { // KeyboardController owns KeyboardControllerProxy so KeyboardControllerProxy // or its subclasses should not take ownership of the |controller|. // |controller| can be null when KeyboardController is destroying. - virtual void SetController(KeyboardController* controller) {} + virtual void SetController(KeyboardController* controller); protected: // The implementation can choose to setup the WebContents before the virtual @@ -122,6 +122,7 @@ class KEYBOARD_EXPORT KeyboardControllerProxy : public aura::WindowObserver { void OnWindowDestroyed(aura::Window* window) override; content::BrowserContext* browser_context() { return browser_context_; } + KeyboardController* keyboard_controller() { return keyboard_controller_; } private: friend class TestApi; @@ -137,6 +138,7 @@ class KEYBOARD_EXPORT KeyboardControllerProxy : public aura::WindowObserver { content::BrowserContext* browser_context_; const GURL default_url_; + keyboard::KeyboardController* keyboard_controller_; scoped_ptr<content::WebContents> keyboard_contents_; scoped_ptr<wm::Shadow> shadow_; |