.

ash/shell.h

Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 410be21240b9f90b453c477758f3313a635a7a35..6bab5b186310e2d6a8f47425ed6638501bf0de95 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -269,9 +269,6 @@ class ASH_EXPORT Shell
   // Called when the user logs in.
   void OnLoginStateChanged(user::LoginStatus status);
 
-  // Called after the logged-in user's profile is ready.
-  void OnLoginUserProfilePrepared();
-
   // Called when the login status changes.
   // TODO(oshima): Investigate if we can merge this and |OnLoginStateChanged|.
   void UpdateAfterLoginStatusChange(user::LoginStatus status);
@@ -286,10 +283,6 @@ class ASH_EXPORT Shell
   // Initializes |launcher_|.  Does nothing if it's already initialized.
   void CreateLauncher();
 
-  // Creates virtual keyboard. Deletes the old virtual keyboard if it's already
-  // exist.
-  void CreateKeyboard();
-
   // Show shelf view if it was created hidden (before session has started).
   void ShowLauncher();
 
@@ -546,8 +539,8 @@ class ASH_EXPORT Shell
 
   void Init();
 
-  // Initializes virtual keyboard controller.
-  void InitKeyboard();
+  // Initializes virtual keyboard controller and attaches it to |root|.
+  void InitKeyboard(internal::RootWindowController* root);
 
   // Initializes the root window so that it can host browser windows.
   void InitRootWindow(aura::Window* root_window);