OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef ASH_SHELL_KEYBOARD_CONTROLLER_PROXY_STUB_H_ | 5 #ifndef ASH_SHELL_KEYBOARD_CONTROLLER_PROXY_STUB_H_ |
6 #define ASH_SHELL_KEYBOARD_CONTROLLER_PROXY_STUB_H_ | 6 #define ASH_SHELL_KEYBOARD_CONTROLLER_PROXY_STUB_H_ |
7 | 7 |
8 #include "ui/aura/test/test_window_delegate.h" | 8 #include "ui/aura/test/test_window_delegate.h" |
9 #include "ui/keyboard/keyboard_controller_proxy.h" | 9 #include "ui/keyboard/keyboard_controller_proxy.h" |
10 | 10 |
(...skipping 13 matching lines...) Expand all Loading... | |
24 | 24 |
25 private: | 25 private: |
26 // Overridden from keyboard::KeyboardControllerProxy: | 26 // Overridden from keyboard::KeyboardControllerProxy: |
27 virtual content::BrowserContext* GetBrowserContext() OVERRIDE; | 27 virtual content::BrowserContext* GetBrowserContext() OVERRIDE; |
28 virtual ui::InputMethod* GetInputMethod() OVERRIDE; | 28 virtual ui::InputMethod* GetInputMethod() OVERRIDE; |
29 virtual void RequestAudioInput(content::WebContents* web_contents, | 29 virtual void RequestAudioInput(content::WebContents* web_contents, |
30 const content::MediaStreamRequest& request, | 30 const content::MediaStreamRequest& request, |
31 const content::MediaResponseCallback& callback) OVERRIDE; | 31 const content::MediaResponseCallback& callback) OVERRIDE; |
32 | 32 |
33 aura::test::TestWindowDelegate delegate_; | 33 aura::test::TestWindowDelegate delegate_; |
34 aura::Window* keyboard_; | |
sadrul
2013/12/04 17:35:20
Should this be a scoped_ptr<> (since the comment o
Shu Chen
2013/12/05 05:01:39
Done.
| |
35 | |
34 DISALLOW_COPY_AND_ASSIGN(KeyboardControllerProxyStub); | 36 DISALLOW_COPY_AND_ASSIGN(KeyboardControllerProxyStub); |
35 }; | 37 }; |
36 | 38 |
37 } // namespace ash | 39 } // namespace ash |
38 | 40 |
39 #endif // ASH_SHELL_KEYBOARD_CONTROLLER_PROXY_STUB_H_ | 41 #endif // ASH_SHELL_KEYBOARD_CONTROLLER_PROXY_STUB_H_ |
OLD | NEW |