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

Unified Diff: ash/root_window_controller.cc

Issue 2965503003: Ash: Inline InitKeyboard, and make the caller of it call CreateKeyboard. (Closed)
Patch Set: Ash: Inline InitKeyboard, and make the caller of it call CreateKeyboard. Created 3 years, 6 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 | « no previous file | ash/shell.h » ('j') | no next file with comments »
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 857e6e920b7ed49f0b1cdbbfe498338bfd039022..9f6bc2bb9abc27de2086001ef2f28382d07da93b 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -749,7 +749,7 @@ void RootWindowController::Init(RootWindowType root_window_type) {
root_window_layout_manager_->OnWindowResized();
if (root_window_type == RootWindowType::PRIMARY) {
if (Shell::GetAshConfig() != Config::MASH)
- shell->InitKeyboard();
+ shell->CreateKeyboard();
} else {
window_tree_host_->Show();
« no previous file with comments | « no previous file | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698