| Index: ash/test/test_shell_delegate.cc
|
| diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
|
| index 532876ec851a7f44b5202adac74ca45a65f1aea7..665740cabbb07553f3bf794088bc73b246816c45 100644
|
| --- a/ash/test/test_shell_delegate.cc
|
| +++ b/ash/test/test_shell_delegate.cc
|
| @@ -10,6 +10,7 @@
|
| #include "ash/host/root_window_host_factory.h"
|
| #include "ash/session_state_delegate.h"
|
| #include "ash/shell.h"
|
| +#include "ash/shell/keyboard_controller_proxy_stub.h"
|
| #include "ash/shell_window_ids.h"
|
| #include "ash/test/test_launcher_delegate.h"
|
| #include "ash/test/test_session_state_delegate.h"
|
| @@ -86,7 +87,7 @@ void TestShellDelegate::ShowKeyboardOverlay() {
|
|
|
| keyboard::KeyboardControllerProxy*
|
| TestShellDelegate::CreateKeyboardControllerProxy() {
|
| - return NULL;
|
| + return new KeyboardControllerProxyStub();
|
| }
|
|
|
| void TestShellDelegate::ShowTaskManager() {
|
|
|