Fix the issue that GetFrameWindow() may change between AddObserver and RemoveObserver in KeyboardCo…

ui/keyboard/keyboard_controller.cc

 // Copyright (c) 2013 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 "ui/keyboard/keyboard_controller.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_iterator.h"
@@ skipping 200 matching lines @@
 
 void WindowBoundsChangeObserver::OnWindowBoundsChanged(aura::Window* window,
     const gfx::Rect& old_bounds, const gfx::Rect& new_bounds) {
   KeyboardController* controller =  KeyboardController::GetInstance();
   if (controller)
     controller->UpdateWindowInsets(window);
 }
 
 void WindowBoundsChangeObserver::OnWindowDestroyed(aura::Window* window) {
    if (window->HasObserver(this))
      window->RemoveObserver(this);

[kevers, 2014/09/02 14:10:34]

observed_windows_.erase(window);

[Shu Chen, 2014/09/02 14:30:43]

Done.

 }
 
 // static
 KeyboardController* KeyboardController::instance_ = NULL;
 
 KeyboardController::KeyboardController(KeyboardControllerProxy* proxy)
     : proxy_(proxy),
       input_method_(NULL),
       keyboard_visible_(false),
       show_on_resize_(false),
       lock_keyboard_(false),
       type_(ui::TEXT_INPUT_TYPE_NONE),
       weak_factory_(this) {
   CHECK(proxy);
   input_method_ = proxy_->GetInputMethod();
   input_method_->AddObserver(this);
   window_bounds_observer_.reset(new WindowBoundsChangeObserver());
 }
 
 KeyboardController::~KeyboardController() {
   if (container_)
     container_->RemoveObserver(this);
   if (input_method_)
     input_method_->RemoveObserver(this);
   ResetWindowInsets();
+
+  for (std::set<aura::Window*>::iterator it = observed_windows_.begin();
+       it != observed_windows_.end(); ++it)
+    (*it)->RemoveObserver(window_bounds_observer_.get());
 }
 
 // static
 void KeyboardController::ResetInstance(KeyboardController* controller) {
   if (instance_ && instance_ != controller)
     delete instance_;
   instance_ = controller;
 }
 
 // static
@@ skipping 297 matching lines @@
 
 void KeyboardController::HideAnimationFinished() {
   proxy_->HideKeyboardContainer(container_.get());
 }
 
 void KeyboardController::AddBoundsChangedObserver(aura::Window* window) {
   aura::Window* target_window = GetFrameWindow(window);
   if (target_window &&
       !target_window->HasObserver(window_bounds_observer_.get())) {
     target_window->AddObserver(window_bounds_observer_.get());
+    observed_windows_.insert(target_window);
   }
 }
 
 void KeyboardController::RemoveBoundsChangedObserver(aura::Window* window) {
   aura::Window* target_window = GetFrameWindow(window);
   if (target_window &&
       target_window->HasObserver(window_bounds_observer_.get())) {
     target_window->RemoveObserver(window_bounds_observer_.get());
+    observed_windows_.erase(target_window);
   }
 }
 
 }  // namespace keyboard