Chromium Code Reviews| 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 85% |
| rename from ash/keyboard_controller_proxy_stub.h |
| rename to ash/shell/keyboard_controller_proxy_stub.h |
| index 25310d716012678fc6c4b05fef83e1b973ec0969..1e32c5648def7a822411cf79607c7027e5eb7189 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(); |
| + aura::Window* GetKeyboardWindow() OVERRIDE; |
|
oshima
2013/11/13 22:23:37
virtual
bshe
2013/11/14 00:11:29
Done.
|
| + |
| 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); |
| }; |