| Index: ash/shell/shell_delegate_impl.cc
|
| diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
|
| index db062e0994e4163cc9dfaf9d2c0feb8115c9b5df..7618cd7d767c7dd86b4ce992bf1c952a7afd6d7d 100644
|
| --- a/ash/shell/shell_delegate_impl.cc
|
| +++ b/ash/shell/shell_delegate_impl.cc
|
| @@ -18,7 +18,7 @@
|
| #include "ash/shell/toplevel_window.h"
|
| #include "ash/shell_window_ids.h"
|
| #include "ash/system/tray/default_system_tray_delegate.h"
|
| -#include "ash/test/content/keyboard_controller_proxy_stub.h"
|
| +#include "ash/test/test_keyboard_ui.h"
|
| #include "ash/wm/window_state.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| @@ -187,9 +187,8 @@ void ShellDelegateImpl::Exit() {
|
| base::MessageLoopForUI::current()->Quit();
|
| }
|
|
|
| -keyboard::KeyboardControllerProxy*
|
| - ShellDelegateImpl::CreateKeyboardControllerProxy() {
|
| - return new KeyboardControllerProxyStub();
|
| +keyboard::KeyboardUI* ShellDelegateImpl::CreateKeyboardUI() {
|
| + return new TestKeyboardUI;
|
| }
|
|
|
| void ShellDelegateImpl::VirtualKeyboardActivated(bool activated) {
|
|
|