Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4619)

Unified Diff: ash/shell/shell_delegate_impl.cc

Issue 1392713002: Extract content dependency from keyboard code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shell/shell_delegate_impl.h ('k') | ash/shell_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) {
« no previous file with comments | « ash/shell/shell_delegate_impl.h ('k') | ash/shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698