Move blocked content from TabContents to TabContentsWrapper.

content/browser/tab_contents/tab_contents.h

 // Copyright (c) 2011 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_TAB_CONTENTS_TAB_CONTENTS_H_
 #define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 #pragma once
 
 #include <deque>
 #include <map>
@@ skipping 37 matching lines @@
 }
 
 namespace prerender {
 class PrerenderManager;
 }
 
 namespace safe_browsing {
 class ClientSideDetectionHost;
 }
 
-class BlockedContentContainer;
 class WebUI;
 class DownloadItem;
 class Extension;
 class InfoBarDelegate;
 class LoadNotificationDetails;
 class OmniboxSearchHint;
 class PluginObserver;
 class Profile;
 class RenderViewHost;
 class SessionStorageNamespace;
@@ skipping 272 matching lines @@
   // Window management ---------------------------------------------------------
 
   // Create a new window constrained to this TabContents' clip and visibility.
   // The window is initialized by using the supplied delegate to obtain basic
   // window characteristics, and the supplied view for the content. Note that
   // the returned ConstrainedWindow might not yet be visible.
   ConstrainedWindow* CreateConstrainedDialog(
       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);
 
   // Returns the number of constrained windows in this tab.  Used by tests.
   size_t constrained_window_count() { return child_windows_.size(); }
 
   typedef std::deque<ConstrainedWindow*> ConstrainedWindowList;
 
   // Return an iterator for the first constrained window in this tab contents.
   ConstrainedWindowList::iterator constrained_window_begin()
   { return child_windows_.begin(); }
 
@@ skipping 64 matching lines @@
   // Notifies the delegate that a download is about to be started.
   // This notification is fired before a local temporary file has been created.
   bool CanDownload(int request_id);
 
   // Notifies the delegate that a download started.
   void OnStartDownload(DownloadItem* download);
 
   // 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.
   bool showing_interstitial_page() const {
     return render_manager_.interstitial_page() != NULL;
   }
 
   // Sets the passed passed interstitial as the currently showing interstitial.
   // |interstitial_page| should be non NULL (use the remove_interstitial_page
   // method to unset the interstitial) and no interstitial page should be set
@@ skipping 41 matching lines @@
   // the encoding of the current tab from 'renderer' (determined by
   // auto-detect, http header, meta, bom detection, etc).
   void SetOverrideEncoding(const std::string& encoding);
 
   // Remove any user-defined override encoding and reload by sending down
   // ViewMsg_ResetPageEncodingToDefault to the renderer.
   void ResetOverrideEncoding();
 
   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_;
   }
 
   void set_opener_web_ui_type(WebUI::TypeID opener_web_ui_type) {
     opener_web_ui_type_ = opener_web_ui_type;
   }
 
   // We want to time how long it takes to create a new tab page.  This method
   // gets called as parts of the new tab page have loaded.
@@ skipping 76 matching lines @@
   int content_restrictions() const { return content_restrictions_; }
   void SetContentRestrictions(int restrictions);
 
   safe_browsing::ClientSideDetectionHost* safebrowsing_detection_host() {
     return safebrowsing_detection_host_.get();
   }
 
   // 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;
 
   // Add and remove observers for page navigation notifications. Adding or
   // removing multiple times has no effect. The order in which notifications
   // are sent to observers is undefined. Clients must be sure to remove the
   // observer before they go away.
   void AddObserver(TabContentsObserver* observer);
   void RemoveObserver(TabContentsObserver* observer);
 
-  // from RenderViewHostDelegate.
+  // From RenderViewHostDelegate.
   virtual bool OnMessageReceived(const IPC::Message& message);
 
  private:
   friend class NavigationController;
   // Used to access the child_windows_ (ConstrainedWindowList) for testing
   // automation purposes.
   friend class TestingAutomationProvider;
 
   FRIEND_TEST_ALL_PREFIXES(TabContentsTest, NoJSMessageOnInterstitials);
   FRIEND_TEST_ALL_PREFIXES(TabContentsTest, UpdateTitle);
@@ skipping 51 matching lines @@
   void OnPDFHasUnsupportedFeature();
 
   void OnGoToEntryAtOffset(int offset);
 
   // Changes the IsLoading state and notifies delegate as needed
   // |details| is used to provide details on the load that just finished
   // (but can be null if not applicable). Can be overridden.
   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.
   void SetNotWaitingForResponse() { waiting_for_response_ = false; }
 
   ConstrainedWindowList child_windows_;
 
   // Expires InfoBars that need to be expired, according to the state carried
   // in |details|, in response to a new NavigationEntry being committed (the
   // user navigated to another page).
@@ skipping 71 matching lines @@
 
   // TabSpecificContentSettings::Delegate implementation.
   virtual void OnContentSettingsAccessed(bool content_was_blocked);
 
   // RenderViewHostDelegate ----------------------------------------------------
 
   // RenderViewHostDelegate implementation.
   virtual RenderViewHostDelegate::View* GetViewDelegate();
   virtual RenderViewHostDelegate::RendererManagement*
       GetRendererManagementDelegate();
-  virtual RenderViewHostDelegate::ContentSettings* GetContentSettingsDelegate();
   virtual RenderViewHostDelegate::SSL* GetSSLDelegate();
   virtual AutomationResourceRoutingDelegate*
       GetAutomationResourceRoutingDelegate();
   virtual TabContents* GetAsTabContents();
   virtual ViewType::Type GetRenderViewType() const;
   virtual int GetBrowserWindowID() const;
   virtual void RenderViewCreated(RenderViewHost* render_view_host);
   virtual void RenderViewReady(RenderViewHost* render_view_host);
   virtual void RenderViewGone(RenderViewHost* render_view_host,
                               base::TerminationStatus status,
@@ skipping 190 matching lines @@
   // messages.
   bool received_page_title_;
 
   // When a navigation occurs, we record its contents MIME type. It can be
   // used to check whether we can do something for some special contents.
   std::string contents_mime_type_;
 
   // 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_;
 
   // Data for shelves and stuff ------------------------------------------------
 
   // Delegates for InfoBars associated with this TabContents.
   std::vector<InfoBarDelegate*> infobar_delegates_;
 
   // Data for misc internal state ----------------------------------------------
 
@@ skipping 67 matching lines @@
   ObserverList<TabContentsObserver> observers_;
 
   // Content restrictions, used to disable print/copy etc based on content's
   // (full-page plugins for now only) permissions.
   int content_restrictions_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContents);
 };
 
 #endif  // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_