Fix virtual keyboard overscroll on Athena

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 127 matching lines @@
     command.AppendArg("1");
   else
     command.AppendArg("0");
   VLOG(1) << "Running " << command.GetCommandLineString();
   base::LaunchOptions options;
   options.wait = true;
   base::LaunchProcess(command, options, NULL);
 #endif
 }
 
-aura::Window *GetFrameWindow(aura::Window *window) {
-  // Each container window has a non-negative id.  Stop traversing at the child
-  // of a container window.
-  if (!window)
-    return NULL;
-  while (window->parent() && window->parent()->id() < 0) {
-    window = window->parent();
-  }
-  return window;
-}
-
 }  // namespace
 
 namespace keyboard {
 
 // Observer for both keyboard show and hide animations. It should be owned by
 // KeyboardController.
 class CallbackAnimationObserver : public ui::LayerAnimationObserver {
  public:
   CallbackAnimationObserver(ui::LayerAnimator* animator,
                             base::Callback<void(void)> callback);
@@ skipping 133 matching lines @@
     FOR_EACH_OBSERVER(KeyboardControllerObserver,
                       observer_list_,
                       OnKeyboardBoundsChanging(new_bounds));
     if (keyboard::IsKeyboardOverscrollEnabled()) {
       // Adjust the height of the viewport for visible windows on the primary
       // display.
       // TODO(kevers): Add EnvObserver to properly initialize insets if a
       // window is created while the keyboard is visible.
       scoped_ptr<content::RenderWidgetHostIterator> widgets(
           content::RenderWidgetHost::GetRenderWidgetHosts());
-      aura::Window *keyboard_window = proxy_->GetKeyboardWindow();
-      aura::Window *root_window = keyboard_window->GetRootWindow();
+      aura::Window* keyboard_window = proxy_->GetKeyboardWindow();
+      aura::Window* root_window = keyboard_window->GetRootWindow();
       while (content::RenderWidgetHost* widget = widgets->GetNextHost()) {
         content::RenderWidgetHostView* view = widget->GetView();
         // Can be NULL, e.g. if the RenderWidget is being destroyed or
         // the render process crashed.
         if (view) {
-          aura::Window *window = view->GetNativeView();
+          aura::Window* window = view->GetNativeView();
           // If virtual keyboard failed to load, a widget that displays error
           // message will be created and adds as a child of the virtual keyboard
           // window. We want to avoid add BoundsChangedObserver to that window.
-          if (GetFrameWindow(window) != keyboard_window &&
+          if (!keyboard_window->Contains(window) &&
               window->GetRootWindow() == root_window) {
             gfx::Rect window_bounds = window->GetBoundsInScreen();
             gfx::Rect intersect = gfx::IntersectRects(window_bounds,
                                                       new_bounds);
             int overlap = intersect.height();
             if (overlap > 0 && overlap < window_bounds.height())
               view->SetInsets(gfx::Insets(0, 0, overlap, 0));
             else
               view->SetInsets(gfx::Insets());
             AddBoundsChangedObserver(window);
@@ skipping 235 matching lines @@
   // background during animation.
   NotifyKeyboardBoundsChanging(proxy_->GetKeyboardWindow()->bounds());
   proxy_->EnsureCaretInWorkArea();
 }
 
 void KeyboardController::HideAnimationFinished() {
   proxy_->HideKeyboardContainer(container_.get());
 }
 
 void KeyboardController::AddBoundsChangedObserver(aura::Window* window) {
-  aura::Window* target_window = GetFrameWindow(window);
+  aura::Window* target_window = window ? window->GetToplevelWindow() : nullptr;
   if (target_window)
     window_bounds_observer_->AddObservedWindow(target_window);
 }
 
 }  // namespace keyboard