Deletes keyboard container before recreating the controller.

ash/root_window_controller.cc

 // 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.
 
 #include "ash/root_window_controller.h"
 
 #include <queue>
 #include <vector>
 
 #include "ash/ash_constants.h"
@@ skipping 513 matching lines @@
     aura::Window* parent = root_window();
 
     keyboard::KeyboardControllerProxy* proxy =
         Shell::GetInstance()->delegate()->CreateKeyboardControllerProxy();
     keyboard_controller_.reset(
         new keyboard::KeyboardController(proxy));
 
     keyboard_controller_->AddObserver(shelf()->shelf_layout_manager());
     keyboard_controller_->AddObserver(panel_layout_manager_);
 
+    // Deletes the old container since |keyboard_controller_| creates a
+    // new container window in GetContainerWindow().
+    delete GetContainer(kShellWindowId_VirtualKeyboardContainer);
+
     aura::Window* keyboard_container =
         keyboard_controller_->GetContainerWindow();
     keyboard_container->set_id(kShellWindowId_VirtualKeyboardContainer);
     parent->AddChild(keyboard_container);
     keyboard_container->SetBounds(parent->bounds());
   }
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 280 matching lines @@
     DisableTouchHudProjection();
 }
 
 RootWindowController* GetRootWindowController(
     const aura::RootWindow* root_window) {
   return root_window ? GetRootWindowSettings(root_window)->controller : NULL;
 }
 
 }  // namespace internal
 }  // namespace ash