Move blocked content from TabContents to TabContentsWrapper.

content/browser/tab_contents/tab_contents.h

Index: content/browser/tab_contents/tab_contents.h
diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h
index 7ac7ea829b929dd6dcb631cf56662a8f4a8753e7..9db8602d0d1fd08554654f397f769ce4b5eefb9b 100644
--- a/content/browser/tab_contents/tab_contents.h
+++ b/content/browser/tab_contents/tab_contents.h
@@ -55,7 +55,6 @@ namespace safe_browsing {
 class ClientSideDetectionHost;
 }
 
-class BlockedContentContainer;
 class WebUI;
 class DownloadItem;
 class Extension;
@@ -348,15 +347,10 @@ class TabContents : public PageNavigator,
       ConstrainedWindowDelegate* delegate);
 
   // Adds a new tab or window with the given already-created contents.
-  // If disposition is NEW_POPUP and user_gesture is false, contents may
-  // be blocked.
-  void AddOrBlockNewContents(TabContents* new_contents,
-                             WindowOpenDisposition disposition,
-                             const gfx::Rect& initial_pos,
-                             bool user_gesture);
-
-  // Called when the blocked popup notification is shown or hidden.
-  virtual void PopupNotificationVisibilityChanged(bool visible);
+  void AddNewContents(TabContents* new_contents,
+                      WindowOpenDisposition disposition,
+                      const gfx::Rect& initial_pos,
+                      bool user_gesture);

[stevenjb, 2011/04/21 19:03:00]

I'm fine with renaming this back to AddNewContents. One reason I renamed it was
to help with confusion between TabContents::AddNewContents and
TabContentsDelegate::AddNewContents(). I don't know how much of a pita
eliminating this fucntion would be, now that it just calls
delegate()->AddNewContents(), but at least it's now just a wrapper.

[Avi (use Gerrit), 2011/04/21 20:06:02]

My change scares me enough already :)

[stevenjb, 2011/04/21 21:06:44]

Understood :)

 
   // Returns the number of constrained windows in this tab.  Used by tests.
   size_t constrained_window_count() { return child_windows_.size(); }
@@ -441,9 +435,6 @@ class TabContents : public PageNavigator,
   // Called when a ConstrainedWindow we own is about to be closed.
   void WillClose(ConstrainedWindow* window);
 
-  // Called when a BlockedContentContainer we own is about to be closed.
-  void WillCloseBlockedContentContainer(BlockedContentContainer* container);
-
   // Interstitials -------------------------------------------------------------
 
   // Various other systems need to know about our interstitials.
@@ -505,16 +496,6 @@ class TabContents : public PageNavigator,
 
   void WindowMoveOrResizeStarted();
 
-  // Sets whether all TabContents added by way of |AddNewContents| should be
-  // blocked. Transitioning from all blocked to not all blocked results in
-  // reevaluating any blocked TabContents, which may result in unblocking some
-  // of the blocked TabContents.
-  void SetAllContentsBlocked(bool value);
-
-  BlockedContentContainer* blocked_content_container() const {
-    return blocked_contents_;
-  }
-
   RendererPreferences* GetMutableRendererPrefs() {
     return &renderer_preferences_;
   }
@@ -611,6 +592,9 @@ class TabContents : public PageNavigator,
   // Query the WebUIFactory for the TypeID for the current URL.
   WebUI::TypeID GetWebUITypeForCurrentState();
 
+  // From RenderViewHostDelegate.
+  virtual RenderViewHostDelegate::ContentSettings* GetContentSettingsDelegate();
+
  protected:
   friend class TabContentsObserver;
   friend class TabContentsObserver::Registrar;
@@ -622,7 +606,7 @@ class TabContents : public PageNavigator,
   void AddObserver(TabContentsObserver* observer);
   void RemoveObserver(TabContentsObserver* observer);
 
-  // from RenderViewHostDelegate.
+  // From RenderViewHostDelegate.
   virtual bool OnMessageReceived(const IPC::Message& message);
 
  private:
@@ -694,18 +678,6 @@ class TabContents : public PageNavigator,
   void SetIsLoading(bool is_loading,
                     LoadNotificationDetails* details);
 
-  // Adds a new tab or window with the given already-created contents.
-  // Called from AddOrBlockNewContents or AddPopup.
-  void AddNewContents(TabContents* new_contents,
-                      WindowOpenDisposition disposition,
-                      const gfx::Rect& initial_pos,
-                      bool user_gesture);
-
-  // Adds the incoming |new_contents| to the |blocked_contents_| container.
-  void AddPopup(TabContents* new_contents,
-                const gfx::Rect& initial_pos,
-                bool user_gesture);
-
   // Called by derived classes to indicate that we're no longer waiting for a
   // response. This won't actually update the throbber, but it will get picked
   // up at the next animation step if the throbber is going.
@@ -797,7 +769,6 @@ class TabContents : public PageNavigator,
   virtual RenderViewHostDelegate::View* GetViewDelegate();
   virtual RenderViewHostDelegate::RendererManagement*
       GetRendererManagementDelegate();
-  virtual RenderViewHostDelegate::ContentSettings* GetContentSettingsDelegate();
   virtual RenderViewHostDelegate::SSL* GetSSLDelegate();
   virtual AutomationResourceRoutingDelegate*
       GetAutomationResourceRoutingDelegate();
@@ -1008,12 +979,6 @@ class TabContents : public PageNavigator,
   // Character encoding.
   std::string encoding_;
 
-  // Object that holds any blocked TabContents spawned from this TabContents.
-  BlockedContentContainer* blocked_contents_;
-
-  // Should we block all child TabContents this attempts to spawn.
-  bool all_contents_blocked_;
-
   // True if this is a secure page which displayed insecure content.
   bool displayed_insecure_content_;