Make code path for bounds changes getting to renderer less brittle

content/browser/web_contents/web_contents_view_aura.h

 // Copyright (c) 2012 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 CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/renderer_host/overscroll_controller_delegate.h"
+#include "content/browser/web_contents/aura/native_view_screen_bounds_observer.h"
 #include "content/common/content_export.h"
 #include "content/port/browser/render_view_host_delegate_view.h"
 #include "content/port/browser/web_contents_view_port.h"
 #include "ui/aura/client/drag_drop_delegate.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/compositor/layer_animation_observer.h"
 
 namespace aura {
 class Window;
 }
 
 namespace ui {
 class DropTargetEvent;
 }
 
 namespace content {
 class OverscrollNavigationOverlay;
 class ShadowLayerDelegate;
 class TouchEditableImplAura;
 class WebContentsViewDelegate;
 class WebContentsImpl;
 class WebDragDestDelegate;
 
 class CONTENT_EXPORT WebContentsViewAura
     : public WebContentsViewPort,
       public RenderViewHostDelegateView,
       NON_EXPORTED_BASE(public OverscrollControllerDelegate),
       public ui::ImplicitAnimationObserver,
       public aura::WindowDelegate,
-      public aura::client::DragDropDelegate {
+      public aura::client::DragDropDelegate,
+      public NativeViewScreenBoundsObserverDelegate {
  public:
   WebContentsViewAura(WebContentsImpl* web_contents,
                       WebContentsViewDelegate* delegate);
 
   void SetupOverlayWindowForTesting();
 
   void SetTouchEditableForTest(TouchEditableImplAura* touch_editable);
 
  private:
-  class WindowObserver;
 #if defined(OS_WIN)
   class ChildWindowObserver;
 #endif
 
   virtual ~WebContentsViewAura();
 
   void SizeChangedCommon(const gfx::Size& size);
 
   void EndDrag(WebKit::WebDragOperationsMask ops);
 
@@ skipping 116 matching lines @@
   // Overridden from ui::EventHandler:
   virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
   virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
 
   // Overridden from aura::client::DragDropDelegate:
   virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE;
   virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE;
   virtual void OnDragExited() OVERRIDE;
   virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE;
 
+  // Overriden from NativeViewScreenBoundsObserverDelegate
+  virtual aura::Window* GetDelegateWindow() OVERRIDE;
+  virtual void AddDelegateWindowObserver(aura::WindowObserver* observer)
+      OVERRIDE;
+  virtual void RemoveDelegateWindowObserver(aura::WindowObserver* observer)
+      OVERRIDE;
+  virtual void RemoveRootWindowObserver(aura::RootWindowObserver* observer)
+      OVERRIDE;
+  virtual void AddRootWindowObserver(aura::RootWindowObserver* observer)
+      OVERRIDE;
+  virtual void OnScreenPositionChanged() OVERRIDE;
+  virtual void OnScreenBoundsChanged() OVERRIDE;
+
   scoped_ptr<aura::Window> window_;
 
   // The window that shows the screenshot of the history page during an
   // overscroll navigation gesture.
   scoped_ptr<aura::Window> overscroll_window_;
 
-  scoped_ptr<WindowObserver> window_observer_;
+  scoped_ptr<NativeViewScreenBoundsObserver> bounds_observer_;
 #if defined(OS_WIN)
   scoped_ptr<ChildWindowObserver> child_window_observer_;
 #endif
 
   // The WebContentsImpl whose contents we display.
   WebContentsImpl* web_contents_;
 
   scoped_ptr<WebContentsViewDelegate> delegate_;
 
   WebKit::WebDragOperationsMask current_drag_op_;
@@ skipping 24 matching lines @@
   scoped_ptr<ShadowLayerDelegate> overscroll_shadow_;
 
   scoped_ptr<TouchEditableImplAura> touch_editable_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_