Store blocked cookies in the tab contents.

chrome/browser/tab_contents/tab_contents.h

 // Copyright (c) 2010 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 CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 
 #include "build/build_config.h"
 
 #include <deque>
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/dom_ui/dom_ui_factory.h"
 #include "chrome/browser/download/save_package.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/fav_icon_helper.h"
 #include "chrome/browser/find_bar_controller.h"
 #include "chrome/browser/find_notification_details.h"
-#include "chrome/browser/geolocation/geolocation_settings_state.h"
 #include "chrome/browser/jsmessage_box_client.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/browser/tab_contents/constrained_window.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/language_state.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/browser/tab_contents/render_view_host_manager.h"
-#include "chrome/common/content_settings.h"
-#include "chrome/common/content_settings_types.h"
+#include "chrome/browser/tab_contents/tab_specific_content_settings.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "chrome/common/navigation_types.h"
 #include "chrome/common/net/url_request_context_getter.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/property_bag.h"
 #include "chrome/common/renderer_preferences.h"
 #include "chrome/common/translate_errors.h"
 #include "gfx/native_widget_types.h"
 #include "gfx/rect.h"
 #include "net/base/load_states.h"
@@ skipping 12 matching lines @@
 
 namespace base {
 class WaitableEvent;
 }
 
 
 namespace IPC {
 class Message;
 }
 
+class AutocompleteHistoryManager;
 class AutoFillManager;
 class BlockedPopupContainer;
 class DOMUI;
 class DownloadItem;
 class Extension;
-class AutocompleteHistoryManager;
+class GeolocationSettingsState;
 class LoadNotificationDetails;
 class OmniboxSearchHint;
 class PluginInstaller;
 class Profile;
 struct RendererPreferences;
 class RenderViewHost;
+class SiteInstance;
+class SkBitmap;
+class TabContents;
 class TabContentsDelegate;
 class TabContentsFactory;
-class SkBitmap;
-class SiteInstance;
-class TabContents;
 class TabContentsView;
 struct ThumbnailScore;
 struct ViewHostMsg_DidPrintPage_Params;
 struct ViewHostMsg_FrameNavigate_Params;
 struct ViewHostMsg_RunFileChooser_Params;
 
 // Describes what goes in the main content area of a tab. TabContents is
 // the only type of TabContents, and these should be merged together.
 class TabContents : public PageNavigator,
                     public NotificationObserver,
                     public RenderViewHostDelegate,
                     public RenderViewHostDelegate::BrowserIntegration,
                     public RenderViewHostDelegate::Resource,
-                    public RenderViewHostDelegate::ContentSettings,
                     public RenderViewHostManager::Delegate,
                     public SelectFileDialog::Listener,
                     public JavaScriptMessageBoxClient,
                     public ImageLoadingTracker::Observer,
-                    public PasswordManager::Delegate {
+                    public PasswordManager::Delegate,
+                    public TabSpecificContentSettings::Delegate {
  public:
   // Flags passed to the TabContentsDelegate.NavigationStateChanged to tell it
   // what has changed. Combine them to update more than one thing.
   enum InvalidateTypes {
     INVALIDATE_URL             = 1 << 0,  // The URL has changed.
     INVALIDATE_TAB             = 1 << 1,  // The favicon, app icon, or crashed
                                           // state changed.
     INVALIDATE_LOAD            = 1 << 2,  // The loading state has changed.
     INVALIDATE_PAGE_ACTIONS    = 1 << 3,  // Page action icons have changed.
     INVALIDATE_BOOKMARK_BAR    = 1 << 4,  // State of ShouldShowBookmarkBar
@@ skipping 132 matching lines @@
   // entry.
   SkBitmap GetFavIcon() const;
 
   // Returns true if we are not using the default favicon.
   bool FavIconIsValid() const;
 
   // Returns whether the favicon should be displayed. If this returns false, no
   // space is provided for the favicon, and the favicon is never displayed.
   virtual bool ShouldDisplayFavIcon();
 
-  // Returns whether a particular kind of content has been blocked for this
-  // page.
-  bool IsContentBlocked(ContentSettingsType content_type) const;
-
-  // Returns the GeolocationSettingsState that controls the
-  // geolocation API usage on this page.
-  const GeolocationSettingsState& geolocation_settings_state() const {
-    return geolocation_settings_state_;
-  }
-
   // Returns a human-readable description the tab's loading state.
   virtual std::wstring GetStatusText() const;
 
   // Return whether this tab contents is loading a resource.
   bool is_loading() const { return is_loading_; }
 
   // Returns whether this tab contents is waiting for a first-response for the
   // main resource of the page. This controls whether the throbber state is
   // "waiting" or "loading."
   bool waiting_for_response() const { return waiting_for_response_; }
@@ skipping 417 matching lines @@
   // The BookmarkDragDelegate is used to forward bookmark drag and drop events
   // to extensions.
   virtual RenderViewHostDelegate::BookmarkDrag* GetBookmarkDragDelegate();
 
   // It is up to callers to call SetBookmarkDragDelegate(NULL) when
   // |bookmark_drag| is deleted since this class does not take ownership of
   // |bookmark_drag|.
   virtual void SetBookmarkDragDelegate(
       RenderViewHostDelegate::BookmarkDrag* bookmark_drag);
 
+  // The TabSpecificContentSettings object is used to query to blocked content

[darin (slow to review), 2010/07/02 16:09:50]

nit: "use to query to" -> "use to query the"

+  // state by various UI elements.
+  TabSpecificContentSettings* GetTabSpecificContentSettings() const;
+
   // PasswordManager::Delegate implementation.
   virtual void FillPasswordForm(
       const webkit_glue::PasswordFormDomManager::FillData& form_data);
   virtual void AddSavePasswordInfoBar(PasswordFormManager* form_to_save);
   virtual Profile* GetProfileForPasswordManager();
   virtual bool DidLastPageLoadEncounterSSLErrors();
 
  private:
   friend class NavigationController;
   // Used to access the child_windows_ (ConstrainedWindowList) for testing
@@ skipping 13 matching lines @@
 #elif defined(TOOLKIT_USES_GTK)
   friend class TabContentsViewGtk;
 #endif
 
   // So InterstitialPage can access SetIsLoading.
   friend class InterstitialPage;
 
   // TODO(brettw) TestTabContents shouldn't exist!
   friend class TestTabContents;
 
-  // Resets the |content_blocked_| array.
-  void ClearBlockedContentSettings();
-
   // 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 the incoming |new_contents| to the |blocked_popups_| container.
   void AddPopup(TabContents* new_contents,
                 const gfx::Rect& initial_pos);
 
@@ skipping 70 matching lines @@
 
   // Helper functions for sending notifications.
   void NotifySwapped();
   void NotifyConnected();
   void NotifyDisconnected();
 
   // If params has a searchable form, this tries to create a new keyword.
   void GenerateKeywordIfNecessary(
       const ViewHostMsg_FrameNavigate_Params& params);
 
+  // ContentBlockedDelegate::Delegate implementation.
+  virtual void OnContentSettingsChange();
+
   // RenderViewHostDelegate ----------------------------------------------------
 
   // RenderViewHostDelegate::BrowserIntegration implementation.
   virtual void OnUserGesture();
   virtual void OnFindReply(int request_id,
                            int number_of_matches,
                            const gfx::Rect& selection_rect,
                            int active_match_ordinal,
                            bool final_update);
   virtual void GoToEntryAtOffset(int offset);
@@ skipping 32 matching lines @@
   virtual void DidDisplayInsecureContent();
   virtual void DidRunInsecureContent(const std::string& security_origin);
   virtual void DidFailProvisionalLoadWithError(
       RenderViewHost* render_view_host,
       bool is_main_frame,
       int error_code,
       const GURL& url,
       bool showing_repost_interstitial);
   virtual void DocumentLoadedInFrame();
 
-  // RenderViewHostDelegate::ContentSettings implementation.
-  virtual void OnContentBlocked(ContentSettingsType type);
-  virtual void OnGeolocationPermissionSet(const GURL& requesting_origin,
-                                          bool allowed);
-
   // RenderViewHostDelegate implementation.
   virtual RenderViewHostDelegate::View* GetViewDelegate();
   virtual RenderViewHostDelegate::RendererManagement*
       GetRendererManagementDelegate();
   virtual RenderViewHostDelegate::BrowserIntegration*
       GetBrowserIntegrationDelegate();
   virtual RenderViewHostDelegate::Resource* GetResourceDelegate();
   virtual RenderViewHostDelegate::ContentSettings* GetContentSettingsDelegate();
   virtual RenderViewHostDelegate::Save* GetSaveDelegate();
   virtual RenderViewHostDelegate::Printing* GetPrintingDelegate();
@@ skipping 189 matching lines @@
 
   // Dialog box used for choosing files to upload from file form fields.
   scoped_refptr<SelectFileDialog> select_file_dialog_;
 
   // Cached web app info data.
   webkit_glue::WebApplicationInfo web_app_info_;
 
   // Cached web app icon.
   SkBitmap app_icon_;
 
+  // RenderViewHost::ContentSettingsDelegate.
+  scoped_ptr<TabSpecificContentSettings> content_settings_delegate_;
+
   // Data for loading state ----------------------------------------------------
 
   // Indicates whether we're currently loading a resource.
   bool is_loading_;
 
   // Indicates if the tab is considered crashed.
   bool is_crashed_;
 
   // See waiting_for_response() above.
   bool waiting_for_response_;
@@ skipping 32 matching lines @@
 
   // Character encoding. TODO(jungshik) : convert to std::string
   std::string encoding_;
 
   // Object that holds any blocked popups frmo the current page.
   BlockedPopupContainer* blocked_popups_;
 
   // TODO(pkasting): Hack to try and fix Linux browser tests.
   bool dont_notify_render_view_;
 
-  // Stores which content setting types actually have blocked content.
-  bool content_blocked_[CONTENT_SETTINGS_NUM_TYPES];
-
   // 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 find in page -----------------------------------------------------
 
@@ skipping 101 matching lines @@
   base::TimeTicks tab_close_start_time_;
 
   // Contextual information to be used for requests created here.
   // Can be NULL in which case we defer to the request context from the
   // profile
   scoped_refptr<URLRequestContextGetter> request_context_;
 
   // Information about the language the page is in and has been translated to.
   LanguageState language_state_;
 
-  // Manages information about Geolocation API usage in this page.
-  GeolocationSettingsState geolocation_settings_state_;
-
   // See description above setter.
   bool closed_by_user_gesture_;
 
   // ---------------------------------------------------------------------------
 
   DISALLOW_COPY_AND_ASSIGN(TabContents);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_