Chromium Code Reviews| 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 "ui/aura/window.h" | |
| 8 #include "ui/views/corewm/input_method_event_filter.h" | 9 #include "ui/views/corewm/input_method_event_filter.h" |
| 9 | 10 |
| 10 using namespace content; | 11 using namespace content; |
| 11 | 12 |
| 12 namespace ash { | 13 namespace ash { |
| 13 | 14 |
| 14 KeyboardControllerProxyStub::KeyboardControllerProxyStub() { | 15 KeyboardControllerProxyStub::KeyboardControllerProxyStub() { |
| 15 } | 16 } |
| 16 | 17 |
| 17 KeyboardControllerProxyStub::~KeyboardControllerProxyStub() { | 18 KeyboardControllerProxyStub::~KeyboardControllerProxyStub() { |
| 18 } | 19 } |
| 19 | 20 |
| 21 aura::Window* KeyboardControllerProxyStub::GetKeyboardWindow() { | |
| 22 aura::Window* window = new aura::Window(&delegate_); | |
| 23 window->Init(ui::LAYER_NOT_DRAWN); | |
| 24 return window; | |
|
oshima
2013/11/01 00:09:02
who owns this?
bshe
2013/11/12 15:28:33
It looks like the keyboard container owns this win
| |
| 25 } | |
| 26 | |
| 20 BrowserContext* KeyboardControllerProxyStub::GetBrowserContext() { | 27 BrowserContext* KeyboardControllerProxyStub::GetBrowserContext() { |
| 21 return Shell::GetInstance()->browser_context(); | 28 return Shell::GetInstance()->browser_context(); |
| 22 } | 29 } |
| 23 | 30 |
| 24 ui::InputMethod* KeyboardControllerProxyStub::GetInputMethod() { | 31 ui::InputMethod* KeyboardControllerProxyStub::GetInputMethod() { |
| 25 return Shell::GetInstance()->input_method_filter()->input_method(); | 32 return Shell::GetInstance()->input_method_filter()->input_method(); |
| 26 } | 33 } |
| 27 | 34 |
| 28 void KeyboardControllerProxyStub::RequestAudioInput( | 35 void KeyboardControllerProxyStub::RequestAudioInput( |
| 29 WebContents* web_contents, | 36 WebContents* web_contents, |
| 30 const MediaStreamRequest& request, | 37 const MediaStreamRequest& request, |
| 31 const MediaResponseCallback& callback) { | 38 const MediaResponseCallback& callback) { |
| 32 } | 39 } |
| 33 | 40 |
| 34 } // namespace ash | 41 } // namespace ash |
| OLD | NEW |