Index: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc |
diff --git a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc |
index 6c6d1c48f3ffd2f8535cc581a3e163a8a0dd995b..ad4b38d9bb608f1f168d9927d3e84e782a3b6321 100644 |
--- a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc |
+++ b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc |
@@ -18,6 +18,7 @@ |
#include "ui/gfx/screen.h" |
#include "ui/gfx/screen_type_delegate.h" |
#include "ui/keyboard/keyboard.h" |
+#include "ui/keyboard/keyboard_controller.h" |
#include "ui/keyboard/keyboard_util.h" |
#include "ui/views/widget/desktop_aura/desktop_screen.h" |
@@ -98,7 +99,7 @@ void ChromeBrowserMainExtraPartsAsh::PostProfileInit() { |
// activation to UpdateWindow() in virtual_keyboard_window_controller.cc. |
if (!keyboard::IsKeyboardUsabilityExperimentEnabled()) { |
ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard( |
- ash::Shell::GetInstance()->keyboard_controller()); |
+ keyboard::KeyboardController::GetInstance()); |
} |
} |