Deletes keyboard container before recreating the controller.

ash/root_window_controller.cc

Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index 3b36a710965dc96bd43d78c610f0cb55e440cc7e..65ed02bc83f42d4adc2a6889a6916e1724c8527d 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -531,6 +531,9 @@ void RootWindowController::InitKeyboard() {
     keyboard_controller_->AddObserver(shelf()->shelf_layout_manager());
     keyboard_controller_->AddObserver(panel_layout_manager_);
 
+    // Deletes the old container if it exists.

[sadrul, 2013/10/01 14:28:28]

Add a comment here that the KeyboardController recreates a container window
(e.g. 'Delete the old container since |keyboard_controller_| creates a new
container window in GetContainerWindow()').

[rsadam, 2013/10/01 14:44:00]

Done.

+    delete GetContainer(kShellWindowId_VirtualKeyboardContainer);
+
     aura::Window* keyboard_container =
         keyboard_controller_->GetContainerWindow();
     keyboard_container->set_id(kShellWindowId_VirtualKeyboardContainer);