diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-13 18:24:18 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-13 18:24:18 +0000 |
| commit | 699ea7ea271a2ba861ebdd78226fac567d24ba7e (patch) | |
| tree | e21eef39ac81b09bd8ff80bd35dcfd0125d6d76d /content/browser/tab_contents/tab_contents.h | |
| parent | f6e8e1e30b038f25432fb66a771851814071cdce (diff) | |
| download | chromium_src-699ea7ea271a2ba861ebdd78226fac567d24ba7e.zip chromium_src-699ea7ea271a2ba861ebdd78226fac567d24ba7e.tar.gz chromium_src-699ea7ea271a2ba861ebdd78226fac567d24ba7e.tar.bz2 | |
Move TabSpecificContentSettings to TabContentWrapper.
This is a reland of 85278 with the Mac test failures fixed.
Review URL: http://codereview.chromium.org/7015048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85294 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/tab_contents/tab_contents.h')
| -rw-r--r-- | content/browser/tab_contents/tab_contents.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h index 87e0fde..9a382b0 100644 --- a/content/browser/tab_contents/tab_contents.h +++ b/content/browser/tab_contents/tab_contents.h @@ -59,7 +59,6 @@ class TabContentsDelegate; class TabContentsObserver; class TabContentsSSLHelper; class TabContentsView; -class TabSpecificContentSettings; class URLPattern; struct RendererPreferences; struct ThumbnailScore; @@ -515,10 +514,6 @@ class TabContents : public PageNavigator, virtual void SetBookmarkDragDelegate( RenderViewHostDelegate::BookmarkDrag* bookmark_drag); - // The TabSpecificContentSettings object is used to query the blocked content - // state by various UI elements. - TabSpecificContentSettings* GetTabSpecificContentSettings() const; - // Updates history with the specified navigation. This is called by // OnMsgNavigate to update history state. void UpdateHistoryForNavigation( @@ -864,9 +859,6 @@ class TabContents : public PageNavigator, // Handles drag and drop event forwarding to extensions. BookmarkDrag* bookmark_drag_; - // RenderViewHost::ContentSettingsDelegate. - scoped_ptr<TabSpecificContentSettings> content_settings_delegate_; - // Data for loading state ---------------------------------------------------- // Indicates whether we're currently loading a resource. |