Overscroll for keyboard disabled while keyboard is hiding.

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 <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 427 matching lines @@
 void KeyboardController::OnInputMethodDestroyed(
     const ui::InputMethod* input_method) {
   DCHECK_EQ(input_method_, input_method);
   input_method_ = NULL;
 }
 
 void KeyboardController::OnShowImeIfNeeded() {
   ShowKeyboardInternal();
 }
 
+bool KeyboardController::ShouldEnableInsets(aura::Window* window) {
+  aura::Window *keyboard_window = proxy_->GetKeyboardWindow();
+  return (keyboard_window->GetRootWindow() == window->GetRootWindow() &&
+          keyboard::IsKeyboardOverscrollEnabled() &&
+          proxy_->GetKeyboardWindow()->IsVisible() &&
+          keyboard_visible_);
+}
+
 void KeyboardController::UpdateWindowInsets(aura::Window* window) {
   aura::Window *keyboard_window = proxy_->GetKeyboardWindow();
   if (window == keyboard_window)
     return;
 
-  bool enableInsets = (keyboard_window->GetRootWindow() ==
-      window->GetRootWindow()) && keyboard::IsKeyboardOverscrollEnabled() &&
-      proxy_->GetKeyboardWindow()->IsVisible();
-
   scoped_ptr<content::RenderWidgetHostIterator> widgets(
       content::RenderWidgetHost::GetRenderWidgetHosts());
   while (content::RenderWidgetHost* widget = widgets->GetNextHost()) {
     content::RenderWidgetHostView* view = widget->GetView();
     if (view && window->Contains(view->GetNativeView())) {
       gfx::Rect window_bounds = view->GetNativeView()->GetBoundsInScreen();
       gfx::Rect intersect = gfx::IntersectRects(window_bounds,
           proxy_->GetKeyboardWindow()->bounds());
-      int overlap = enableInsets ? intersect.height() : 0;
+      int overlap = ShouldEnableInsets(window) ? intersect.height() : 0;
       if (overlap > 0 && overlap < window_bounds.height())
         view->SetInsets(gfx::Insets(0, 0, overlap, 0));
       else
         view->SetInsets(gfx::Insets());
       return;
     }
   }
 }
 
 void KeyboardController::ShowKeyboardInternal() {
@@ skipping 97 matching lines @@
   proxy_->HideKeyboardContainer(container_.get());
 }
 
 void KeyboardController::AddBoundsChangedObserver(aura::Window* window) {
   aura::Window* target_window = GetFrameWindow(window);
   if (target_window)
     window_bounds_observer_->AddObservedWindow(target_window);
 }
 
 }  // namespace keyboard