Fix virtual keyboard overscroll on Athena

ui/keyboard/keyboard_controller.h

 // 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.
 
 #ifndef UI_KEYBOARD_KEYBOARD_CONTROLLER_H_
 #define UI_KEYBOARD_KEYBOARD_CONTROLLER_H_
 
 #include "base/basictypes.h"
 #include "base/event_types.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/ime/input_method_observer.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/gfx/rect.h"
 #include "ui/keyboard/keyboard_export.h"
 #include "url/gurl.h"
 
 namespace aura {
 class Window;
 }
 namespace ui {
 class InputMethod;
 class TextInputClient;
 }
 
 namespace keyboard {
 
 class CallbackAnimationObserver;
-class WindowBoundsChangeObserver;
 class KeyboardControllerObserver;
 class KeyboardControllerProxy;
+class WindowBoundsChangeObserver;
 
 // Animation distance.
 const int kAnimationDistance = 30;
 
 // Provides control of the virtual keyboard, including providing a container
 // and controlling visibility.
 class KEYBOARD_EXPORT KeyboardController : public ui::InputMethodObserver,
                                            public aura::WindowObserver {
  public:
   // Different ways to hide the keyboard.
@@ skipping 90 matching lines @@
   void ResetWindowInsets();
 
   // Returns true if keyboard is scheduled to hide.
   bool WillHideKeyboard() const;
 
   // Called when show and hide animation finished successfully. If the animation
   // is aborted, it won't be called.
   void ShowAnimationFinished();
   void HideAnimationFinished();
 
-  // Adds an observer for tracking changes to a window size or
-  // position while the keyboard is displayed. Any window repositioning
-  // invalidates insets for overscrolling.
-  void AddBoundsChangedObserver(aura::Window* window);
-
   scoped_ptr<KeyboardControllerProxy> proxy_;
   scoped_ptr<aura::Window> container_;
   // CallbackAnimationObserver should destructed before container_ because it
   // uses container_'s animator.
   scoped_ptr<CallbackAnimationObserver> animation_observer_;
 
-  scoped_ptr<WindowBoundsChangeObserver> window_bounds_observer_;
+  // Tracks changes to the root window's size while the keyboard is displayed
+  // (e.g. due to screen rotation).
+  scoped_ptr<WindowBoundsChangeObserver> root_window_bounds_observer_;
 
   ui::InputMethod* input_method_;
   bool keyboard_visible_;
   bool show_on_resize_;
   bool lock_keyboard_;
   ui::TextInputType type_;
 
   ObserverList<KeyboardControllerObserver> observer_list_;
 
   // The currently used keyboard position.
   gfx::Rect current_keyboard_bounds_;
 
   static KeyboardController* instance_;
 
   base::WeakPtrFactory<KeyboardController> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(KeyboardController);
 };
 
 }  // namespace keyboard
 
 #endif  // UI_KEYBOARD_KEYBOARD_CONTROLLER_H_