| 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/wm/core/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 } |
| (...skipping 19 matching lines...) Expand all Loading... |
| 40 return Shell::GetInstance()->input_method_filter()->input_method(); | 40 return Shell::GetInstance()->input_method_filter()->input_method(); |
| 41 } | 41 } |
| 42 | 42 |
| 43 void KeyboardControllerProxyStub::RequestAudioInput( | 43 void KeyboardControllerProxyStub::RequestAudioInput( |
| 44 WebContents* web_contents, | 44 WebContents* web_contents, |
| 45 const MediaStreamRequest& request, | 45 const MediaStreamRequest& request, |
| 46 const MediaResponseCallback& callback) { | 46 const MediaResponseCallback& callback) { |
| 47 } | 47 } |
| 48 | 48 |
| 49 } // namespace ash | 49 } // namespace ash |
| OLD | NEW |