| 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..07def786ab55cdeb4a1885ef65fc33379775a34f 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 {
|
| +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
|
| @@ -67,6 +73,7 @@ class AshKeyboardControllerProxy
|
|
|
| scoped_ptr<extensions::ExtensionFunctionDispatcher>
|
| extension_function_dispatcher_;
|
| + scoped_ptr<AshKeyboardControllerObserver> observer_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(AshKeyboardControllerProxy);
|
| };
|
|
|