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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/root_window_controller.cc

Issue 219503003: Make keyboard controller a singleton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nits. Created 6 years, 9 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/display/virtual_keyboard_window_controller.cc ('k') | ash/shell.h » ('j') | ui/keyboard/keyboard_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index caa1228890e223325fdbf44c9f3b658fbb2d0b0d..0da7c58bc471e6c45e8f369fe222d319e87c0516 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -454,7 +454,7 @@ void RootWindowController::CloseChildWindows() {
// Deactivate keyboard container before closing child windows and shutting
// down associated layout managers.
- DeactivateKeyboard(Shell::GetInstance()->keyboard_controller());
+ DeactivateKeyboard(keyboard::KeyboardController::GetInstance());
// panel_layout_manager_ needs to be shut down before windows are destroyed.
if (panel_layout_manager_) {
« no previous file with comments | « ash/display/virtual_keyboard_window_controller.cc ('k') | ash/shell.h » ('j') | ui/keyboard/keyboard_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698