summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_webnavigation_api.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-13 07:29:32 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-13 07:29:32 +0000
commit8093a5439afecec131b78422abdeb7038de6f7a3 (patch)
treea2f7dc196c51970186615d10d0a884e18c2b7ae9 /chrome/browser/extensions/extension_webnavigation_api.cc
parent697a650a1084ef9c77f9c5675f891d6157f36e99 (diff)
downloadchromium_src-8093a5439afecec131b78422abdeb7038de6f7a3.zip
chromium_src-8093a5439afecec131b78422abdeb7038de6f7a3.tar.gz
chromium_src-8093a5439afecec131b78422abdeb7038de6f7a3.tar.bz2
Get rid of the remaining content settings code in the content module.
Add user data to content::ResourceContext that points to chrome's ProfileIOData. That way when the embedder code is called by content, it can get back to its profile specific data structures like HostContentSettingsMap. BUG=76793 Review URL: http://codereview.chromium.org/7014025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85247 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_webnavigation_api.cc')
-rw-r--r--chrome/browser/extensions/extension_webnavigation_api.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_webnavigation_api.cc b/chrome/browser/extensions/extension_webnavigation_api.cc
index d17e607..04da675 100644
--- a/chrome/browser/extensions/extension_webnavigation_api.cc
+++ b/chrome/browser/extensions/extension_webnavigation_api.cc
@@ -303,7 +303,8 @@ void ExtensionWebNavigationTabObserver::DidStartProvisionalLoadForFrame(
int64 frame_id,
bool is_main_frame,
const GURL& validated_url,
- bool is_error_page) {
+ bool is_error_page,
+ RenderViewHost* render_view_host) {
navigation_state_.TrackFrame(frame_id,
validated_url,
is_main_frame,