Ash: Inline InitKeyboard, and make the caller of it call CreateKeyboard.

ash/shell.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 269 matching lines @@
   // Sets work area insets of the display containing |window|, pings observers.
   void SetDisplayWorkAreaInsets(aura::Window* window,
                                 const gfx::Insets& insets);
 
   // Called when a casting session is started or stopped.
   void OnCastingSessionStartedOrStopped(bool started);
 
   // 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.
   void DeactivateKeyboard();
 
   // Test if MaximizeModeWindowManager is not enabled, and if
   // MaximizeModeController is not currently setting a display rotation. Or if
   // the |resolution_notification_controller_| is not showing its confirmation
   // dialog. If true then changes to display settings can be saved.
   bool ShouldSaveDisplaySettings();
@@ skipping 318 matching lines @@
   friend class SmsObserverTest;
   friend class test::ShellTestApi;
   friend class shell::WindowWatcher;
 
   Shell(std::unique_ptr<ShellDelegate> shell_delegate,
         std::unique_ptr<ShellPort> shell_port);
   ~Shell() override;
 
   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);
 
   void SetSystemTrayDelegate(std::unique_ptr<SystemTrayDelegate> delegate);
   void DeleteSystemTrayDelegate();
 
   // Destroys all child windows including widgets across all roots.
   void CloseAllRootWindowChildWindows();
 
   // SystemModalContainerEventFilterDelegate:
@@ skipping 190 matching lines @@
   base::ObserverList<ShellObserver> shell_observers_;
 
   scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_