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 #include "ash/keyboard_controller_proxy_stub.h" | 5 #include "ash/shell/keyboard_controller_proxy_stub.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/shell_delegate.h" | 8 #include "ash/shell_delegate.h" |
| 9 #include "ui/aura/window.h" |
9 #include "ui/views/corewm/input_method_event_filter.h" | 10 #include "ui/views/corewm/input_method_event_filter.h" |
10 | 11 |
11 using namespace content; | 12 using namespace content; |
12 | 13 |
13 namespace ash { | 14 namespace ash { |
14 | 15 |
15 KeyboardControllerProxyStub::KeyboardControllerProxyStub() { | 16 KeyboardControllerProxyStub::KeyboardControllerProxyStub() { |
16 } | 17 } |
17 | 18 |
18 KeyboardControllerProxyStub::~KeyboardControllerProxyStub() { | 19 KeyboardControllerProxyStub::~KeyboardControllerProxyStub() { |
19 } | 20 } |
20 | 21 |
| 22 aura::Window* KeyboardControllerProxyStub::GetKeyboardWindow() { |
| 23 aura::Window* window = new aura::Window(&delegate_); |
| 24 window->Init(ui::LAYER_NOT_DRAWN); |
| 25 return window; |
| 26 } |
| 27 |
21 BrowserContext* KeyboardControllerProxyStub::GetBrowserContext() { | 28 BrowserContext* KeyboardControllerProxyStub::GetBrowserContext() { |
22 return Shell::GetInstance()->delegate()->GetCurrentBrowserContext(); | 29 return Shell::GetInstance()->delegate()->GetCurrentBrowserContext(); |
23 } | 30 } |
24 | 31 |
25 ui::InputMethod* KeyboardControllerProxyStub::GetInputMethod() { | 32 ui::InputMethod* KeyboardControllerProxyStub::GetInputMethod() { |
26 return Shell::GetInstance()->input_method_filter()->input_method(); | 33 return Shell::GetInstance()->input_method_filter()->input_method(); |
27 } | 34 } |
28 | 35 |
29 void KeyboardControllerProxyStub::RequestAudioInput( | 36 void KeyboardControllerProxyStub::RequestAudioInput( |
30 WebContents* web_contents, | 37 WebContents* web_contents, |
31 const MediaStreamRequest& request, | 38 const MediaStreamRequest& request, |
32 const MediaResponseCallback& callback) { | 39 const MediaResponseCallback& callback) { |
33 } | 40 } |
34 | 41 |
35 } // namespace ash | 42 } // namespace ash |
OLD | NEW |