Delayed loading of the virtual keyboard.

ui/keyboard/keyboard_controller.h

Index: ui/keyboard/keyboard_controller.h
diff --git a/ui/keyboard/keyboard_controller.h b/ui/keyboard/keyboard_controller.h
index 1a2b18226ed761f472928429e772661ca8fd6147..74471b4540cb9bf28207ca8f2f7fb5c4f94a3572 100644
--- a/ui/keyboard/keyboard_controller.h
+++ b/ui/keyboard/keyboard_controller.h
@@ -16,15 +16,17 @@ class Window;
 }
 
 namespace ui {
+class InputMethod;
 class TextInputClient;
 }
 
 namespace keyboard {
 
 class KeyboardControllerProxy;
+class KeyboardLayoutManager;
 
-// Provides control of the virtual keyboard, including providing a container,
-// managing object lifetimes and controlling visibility.
+// Provides control of the virtual keyboard, including providing a container
+// and controlling visibility.
 class KEYBOARD_EXPORT KeyboardController : public ui::InputMethodObserver,
                                            public aura::WindowObserver {
  public:
@@ -47,7 +49,8 @@ class KEYBOARD_EXPORT KeyboardController : public ui::InputMethodObserver,
   virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
 
   scoped_ptr<KeyboardControllerProxy> proxy_;
-  aura::Window* container_;
+  KeyboardLayoutManager* layout_manager_;
+  ui::InputMethod* input_method_;
 
   DISALLOW_COPY_AND_ASSIGN(KeyboardController);
 };