| 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 if (!keyboard_) { | 23 if (!keyboard_) { |
| 24 keyboard_.reset(new aura::Window(&delegate_)); | 24 keyboard_.reset(new aura::Window(&delegate_)); |
| 25 keyboard_->Init(ui::LAYER_NOT_DRAWN); | 25 keyboard_->Init(aura::WINDOW_LAYER_NOT_DRAWN); |
| 26 } | 26 } |
| 27 return keyboard_.get(); | 27 return keyboard_.get(); |
| 28 } | 28 } |
| 29 | 29 |
| 30 BrowserContext* KeyboardControllerProxyStub::GetBrowserContext() { | 30 BrowserContext* KeyboardControllerProxyStub::GetBrowserContext() { |
| 31 // TODO(oshima): investigate which profile to use. | 31 // TODO(oshima): investigate which profile to use. |
| 32 return Shell::GetInstance()->delegate()->GetActiveBrowserContext(); | 32 return Shell::GetInstance()->delegate()->GetActiveBrowserContext(); |
| 33 } | 33 } |
| 34 | 34 |
| 35 ui::InputMethod* KeyboardControllerProxyStub::GetInputMethod() { | 35 ui::InputMethod* KeyboardControllerProxyStub::GetInputMethod() { |
| 36 return Shell::GetInstance()->input_method_filter()->input_method(); | 36 return Shell::GetInstance()->input_method_filter()->input_method(); |
| 37 } | 37 } |
| 38 | 38 |
| 39 void KeyboardControllerProxyStub::RequestAudioInput( | 39 void KeyboardControllerProxyStub::RequestAudioInput( |
| 40 WebContents* web_contents, | 40 WebContents* web_contents, |
| 41 const MediaStreamRequest& request, | 41 const MediaStreamRequest& request, |
| 42 const MediaResponseCallback& callback) { | 42 const MediaResponseCallback& callback) { |
| 43 } | 43 } |
| 44 | 44 |
| 45 } // namespace ash | 45 } // namespace ash |
| OLD | NEW |