Deletes keyboard container before recreating the controller.

ui/keyboard/keyboard_controller.cc

Index: ui/keyboard/keyboard_controller.cc
diff --git a/ui/keyboard/keyboard_controller.cc b/ui/keyboard/keyboard_controller.cc
index 83e7f321c5c77f8e389e3fea5c9232e5ce87a208..787cc4cb81a1164b61a179448e13c297fb04b714 100644
--- a/ui/keyboard/keyboard_controller.cc
+++ b/ui/keyboard/keyboard_controller.cc
@@ -132,8 +132,10 @@ KeyboardController::KeyboardController(KeyboardControllerProxy* proxy)
 }
 
 KeyboardController::~KeyboardController() {
-  if (container_)
+  if (container_) {
     container_->RemoveObserver(this);
+    container_->SetLayoutManager(NULL);

[sadrul, 2013/09/27 20:25:16]

The container window takes ownership of the layout-manager created below (line
149), and the layout-manager is not tied to the lifetime of this controller. So
it should not be necessary to reset the layout-manager here.

I left a comment on the bug explaining what I think would be better fixes.

+  }
   if (input_method_)
     input_method_->RemoveObserver(this);
 }