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