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

Unified Diff: ash/shell.h

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 | « ash/root_window_controller.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 72a1e8dc2ca8ae4705b30037d0c6fdaa015e84b0..9ade6b9e9734fbc21bb39d7a8d875e8f220ff167 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -287,8 +287,8 @@ class ASH_EXPORT Shell : public SessionObserver,
// Called when a root window is created.
void OnRootWindowAdded(aura::Window* root_window);
- // Creates a virtual keyboard. Deletes the old virtual keyboard if it already
- // exists.
+ // Creates a keyboard controller and associate it with the primary root window
+ // controller. Destroys the old keyboard controller if it already exists.
void CreateKeyboard();
// Deactivates the virtual keyboard.
@@ -627,9 +627,6 @@ class ASH_EXPORT Shell : public SessionObserver,
void Init(const ShellInitParams& init_params);
- // Initializes virtual keyboard controller.
- void InitKeyboard();
-
// Initializes the root window so that it can host browser windows.
void InitRootWindow(aura::Window* root_window);
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698