summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/blocked_content
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-28 04:09:50 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-28 04:09:50 +0000
commitc5f51194ca9eedb64337e79567759e2307053d28 (patch)
tree3b8c468cf77da2224924620e03f914aed906db7f /chrome/browser/ui/blocked_content
parentf65809c9dc3918c8907e412721d9512025a01b83 (diff)
downloadchromium_src-c5f51194ca9eedb64337e79567759e2307053d28.zip
chromium_src-c5f51194ca9eedb64337e79567759e2307053d28.tar.gz
chromium_src-c5f51194ca9eedb64337e79567759e2307053d28.tar.bz2
Switch TabSpecificContentSettings to use WebContentsUserData.
BUG=107201 TEST=no visible change Review URL: https://chromiumcodereview.appspot.com/10969023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159199 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/blocked_content')
-rw-r--r--chrome/browser/ui/blocked_content/blocked_content_tab_helper.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/ui/blocked_content/blocked_content_tab_helper.cc b/chrome/browser/ui/blocked_content/blocked_content_tab_helper.cc
index 7aec2b9..b1672ae 100644
--- a/chrome/browser/ui/blocked_content/blocked_content_tab_helper.cc
+++ b/chrome/browser/ui/blocked_content/blocked_content_tab_helper.cc
@@ -53,8 +53,8 @@ void BlockedContentTabHelper::DidNavigateMainFrame(
void BlockedContentTabHelper::PopupNotificationVisibilityChanged(
bool visible) {
if (!web_contents()->IsBeingDestroyed()) {
- TabContents* tab_contents = TabContents::FromWebContents(web_contents());
- tab_contents->content_settings()->SetPopupsBlocked(visible);
+ TabSpecificContentSettings::FromWebContents(web_contents())->
+ SetPopupsBlocked(visible);
}
}
@@ -132,9 +132,8 @@ void BlockedContentTabHelper::AddPopup(content::WebContents* new_contents,
disposition,
initial_pos,
true); // user_gesture
- TabContents* tab_contents = TabContents::FromWebContents(web_contents());
- tab_contents->content_settings()->OnContentBlocked(
- CONTENT_SETTINGS_TYPE_POPUPS, std::string());
+ TabSpecificContentSettings::FromWebContents(web_contents())->
+ OnContentBlocked(CONTENT_SETTINGS_TYPE_POPUPS, std::string());
}
}