Re-land 71230....

chrome/browser/ui/views/tab_contents/tab_contents_container.h

Index: chrome/browser/ui/views/tab_contents/tab_contents_container.h
===================================================================
--- chrome/browser/ui/views/tab_contents/tab_contents_container.h	(revision 71256)
+++ chrome/browser/ui/views/tab_contents/tab_contents_container.h	(working copy)
@@ -19,19 +19,6 @@
 class TabContentsContainer : public views::View,
                              public NotificationObserver {
  public:
-  // Interface to request the reserved contents area updates.
-  class ReservedAreaDelegate {
-   public:
-    // Notifies that |source|'s reserved contents area should be updated.
-    // Reserved contents area is a rect in tab contents view coordinates where
-    // contents should not be rendered (to display the resize corner, sidebar
-    // mini tabs or any other UI elements overlaying this container).
-    virtual void UpdateReservedContentsRect(
-        const TabContentsContainer* source) = 0;
-   protected:
-    virtual ~ReservedAreaDelegate() {}
-  };
-
   TabContentsContainer();
   virtual ~TabContentsContainer();
 
@@ -50,9 +37,9 @@
   // so performance is better.
   void SetFastResize(bool fast_resize);
 
-  void set_reserved_area_delegate(ReservedAreaDelegate* delegate) {
-    reserved_area_delegate_ = delegate;
-  }
+  // Updates the current reserved rect in view coordinates where contents
+  // should not be rendered to draw the resize corner, sidebar mini tabs etc.
+  void SetReservedContentsRect(const gfx::Rect& reserved_rect);
 
   // Overridden from NotificationObserver:
   virtual void Observe(NotificationType type,
@@ -84,8 +71,7 @@
   void TabContentsDestroyed(TabContents* contents);
 
   // Called when the RenderWidgetHostView of the hosted TabContents has changed.
-  void RenderWidgetHostViewChanged(RenderWidgetHostView* old_view,
-                                   RenderWidgetHostView* new_view);
+  void RenderWidgetHostViewChanged(RenderWidgetHostView* new_view);
 
   // An instance of a NativeTabContentsContainer object that holds the native
   // view handle associated with the attached TabContents.
@@ -97,8 +83,10 @@
   // Handles registering for our notifications.
   NotificationRegistrar registrar_;
 
-  // Delegate for enquiring reserved contents area. Not owned by us.
-  ReservedAreaDelegate* reserved_area_delegate_;
+  // The current reserved rect in view coordinates where contents should not be
+  // rendered to draw the resize corner, sidebar mini tabs etc.
+  // Cached here to update ever changing renderers.
+  gfx::Rect cached_reserved_rect_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContentsContainer);
 };