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

Unified Diff: chrome/browser/ui/ash/chrome_shell_delegate.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
Index: chrome/browser/ui/ash/chrome_shell_delegate.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
index 9cdec31817f8cbe257b9cf0877adb10ca19d4526..54fea491cce7d2f63500d86bb4d4149b81f893bb 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -14,7 +14,7 @@
#include "chrome/browser/profiles/profiles_state.h"
#include "chrome/browser/ui/app_list/app_list_view_delegate.h"
#include "chrome/browser/ui/ash/app_list/app_list_service_ash.h"
-#include "chrome/browser/ui/ash/ash_keyboard_controller_proxy.h"
+#include "chrome/browser/ui/ash/chrome_keyboard_ui.h"
#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
#include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
#include "chrome/browser/ui/ash/session_util.h"
@@ -193,10 +193,8 @@ gfx::Image ChromeShellDelegate::GetDeprecatedAcceleratorImage() const {
IDR_BLUETOOTH_KEYBOARD);
}
-keyboard::KeyboardControllerProxy*
- ChromeShellDelegate::CreateKeyboardControllerProxy() {
- return new AshKeyboardControllerProxy(
- ProfileManager::GetActiveUserProfile());
+keyboard::KeyboardUI* ChromeShellDelegate::CreateKeyboardUI() {
+ return new ChromeKeyboardUI(ProfileManager::GetActiveUserProfile());
}
void ChromeShellDelegate::VirtualKeyboardActivated(bool activated) {
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.h ('k') | chrome/browser/ui/ash/keyboard_controller_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698