Chromium Code Reviews| Index: chrome/browser/ui/ash/ash_keyboard_controller_proxy.h |
| diff --git a/chrome/browser/ui/ash/ash_keyboard_controller_proxy.h b/chrome/browser/ui/ash/ash_keyboard_controller_proxy.h |
| index 40b4777887c153c10fe312b992be128596b6eedf..1a62168ca7327072c9538e2926b6a95e59066fe1 100644 |
| --- a/chrome/browser/ui/ash/ash_keyboard_controller_proxy.h |
| +++ b/chrome/browser/ui/ash/ash_keyboard_controller_proxy.h |
| @@ -19,6 +19,9 @@ namespace extensions { |
| class ExtensionFunctionDispatcher; |
| class WindowController; |
| } |
| +namespace keyboard { |
|
sadrul
2015/05/14 07:58:42
Should go after gfx?
bshe
2015/05/14 15:07:14
oops. Done
|
| +class KeyboardController; |
| +} |
| namespace gfx { |
| class Rect; |
| } |
| @@ -37,6 +40,8 @@ class AshKeyboardControllerProxy |
| ~AshKeyboardControllerProxy() override; |
| private: |
| + class AshKeyboardControllerObserver; |
| + |
| void OnRequest(const ExtensionHostMsg_Request_Params& params); |
| // keyboard::KeyboardControllerProxy overrides |
| @@ -46,6 +51,7 @@ class AshKeyboardControllerProxy |
| const content::MediaStreamRequest& request, |
| const content::MediaResponseCallback& callback) override; |
| void SetupWebContents(content::WebContents* contents) override; |
| + void SetController(keyboard::KeyboardController* controller) override; |
| void ShowKeyboardContainer(aura::Window* container) override; |
| // The overridden implementation dispatches |
| @@ -65,8 +71,11 @@ class AshKeyboardControllerProxy |
| bool OnMessageReceived(const IPC::Message& message) override; |
| void RenderViewCreated(content::RenderViewHost* render_view_host) override; |
| + keyboard::KeyboardController* keyboard_controller_; |
| + |
| scoped_ptr<extensions::ExtensionFunctionDispatcher> |
| extension_function_dispatcher_; |
| + scoped_ptr<AshKeyboardControllerObserver> observer_; |
|
sadrul
2015/05/14 07:58:42
I think you can keep this as just scoped_ptr<Keybo
bshe
2015/05/14 15:07:14
Done.
|
| DISALLOW_COPY_AND_ASSIGN(AshKeyboardControllerProxy); |
| }; |