| Index: ash/shell/keyboard_controller_proxy_stub.h
|
| diff --git a/ash/keyboard_controller_proxy_stub.h b/ash/shell/keyboard_controller_proxy_stub.h
|
| similarity index 84%
|
| rename from ash/keyboard_controller_proxy_stub.h
|
| rename to ash/shell/keyboard_controller_proxy_stub.h
|
| index 25310d716012678fc6c4b05fef83e1b973ec0969..9abdd9579c9fd51f3cff26ae1d0e72241c049b8d 100644
|
| --- a/ash/keyboard_controller_proxy_stub.h
|
| +++ b/ash/shell/keyboard_controller_proxy_stub.h
|
| @@ -6,8 +6,13 @@
|
| #define ASH_KEYBOARD_CONTROLLER_PROXY_STUB_H_
|
|
|
| #include "ash/ash_export.h"
|
| +#include "ui/aura/test/test_window_delegate.h"
|
| #include "ui/keyboard/keyboard_controller_proxy.h"
|
|
|
| +namespace aura {
|
| +class Window;
|
| +} // namespace aura
|
| +
|
| namespace ash {
|
|
|
| // Stub implementation of KeyboardControllerProxy
|
| @@ -17,6 +22,8 @@ class ASH_EXPORT KeyboardControllerProxyStub
|
| KeyboardControllerProxyStub();
|
| virtual ~KeyboardControllerProxyStub();
|
|
|
| + virtual aura::Window* GetKeyboardWindow() OVERRIDE;
|
| +
|
| private:
|
| // Overridden from keyboard::KeyboardControllerProxy:
|
| virtual content::BrowserContext* GetBrowserContext() OVERRIDE;
|
| @@ -25,6 +32,7 @@ class ASH_EXPORT KeyboardControllerProxyStub
|
| const content::MediaStreamRequest& request,
|
| const content::MediaResponseCallback& callback) OVERRIDE;
|
|
|
| + aura::test::TestWindowDelegate delegate_;
|
| DISALLOW_COPY_AND_ASSIGN(KeyboardControllerProxyStub);
|
| };
|
|
|
|
|