Chromium Code Reviews| Index: ui/keyboard/keyboard_controller_proxy.h |
| diff --git a/ui/keyboard/keyboard_controller_proxy.h b/ui/keyboard/keyboard_controller_proxy.h |
| index 2c91446460815b39bb4eee56fb7d20ff9295aa4a..366a27998fd644bc52797cea02d8b59e4c0bc300 100644 |
| --- a/ui/keyboard/keyboard_controller_proxy.h |
| +++ b/ui/keyboard/keyboard_controller_proxy.h |
| @@ -31,6 +31,8 @@ class Shadow; |
| namespace keyboard { |
| +class KeyboardController; |
| + |
| // A proxy used by the KeyboardController to get access to the virtual |
| // keyboard window. |
| class KEYBOARD_EXPORT KeyboardControllerProxy : public aura::WindowObserver { |
| @@ -101,6 +103,8 @@ class KEYBOARD_EXPORT KeyboardControllerProxy : public aura::WindowObserver { |
| // provide one. |
| virtual void ReloadKeyboardIfNeeded(); |
| + virtual void SetController(KeyboardController* controller); |
| + |
| protected: |
| // The implementation can choose to setup the WebContents before the virtual |
| // keyboard page is loaded (e.g. install a WebContentsObserver). |
| @@ -115,6 +119,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; |
| @@ -129,6 +134,8 @@ class KEYBOARD_EXPORT KeyboardControllerProxy : public aura::WindowObserver { |
| // keyboard. |
| content::BrowserContext* browser_context_; |
| + KeyboardController* keyboard_controller_; |
| + |
|
sadrul
2015/05/13 16:47:30
There's no reason for the default impl here to sto
bshe
2015/05/13 18:30:03
Correct. I have changed the code according to your
|
| const GURL default_url_; |
| scoped_ptr<content::WebContents> keyboard_contents_; |