diff options
| author | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-09 12:55:14 +0000 |
|---|---|---|
| committer | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-09 12:55:14 +0000 |
| commit | 6158e4fffc80c2e6aaef1fa7b8fc28c2b9e96d1e (patch) | |
| tree | 43e0a1679453770f7bf78724332a118494b00560 /chrome/browser/renderer_host | |
| parent | 65df010baf6b520699cd44e4396c72d0d5e56538 (diff) | |
| download | chromium_src-6158e4fffc80c2e6aaef1fa7b8fc28c2b9e96d1e.zip chromium_src-6158e4fffc80c2e6aaef1fa7b8fc28c2b9e96d1e.tar.gz chromium_src-6158e4fffc80c2e6aaef1fa7b8fc28c2b9e96d1e.tar.bz2 | |
ContentSettingsObserver (+ related classes) cleanup.
Per-page content settings and default content settings are no longer needed,
since the renderer stores the content setting rules for images and scripts.
BUG=102662
TEST=NONE
Review URL: http://codereview.chromium.org/8498007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109228 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
| -rw-r--r-- | chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc index 35231bb..3d86c7c 100644 --- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc +++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc @@ -333,16 +333,6 @@ void ChromeResourceDispatcherHostDelegate::OnResponseStarted( } } - // We must send the content settings for the URL before sending response - // headers to the renderer. - const content::ResourceContext& resource_context = filter->resource_context(); - ProfileIOData* io_data = - reinterpret_cast<ProfileIOData*>(resource_context.GetUserData(NULL)); - HostContentSettingsMap* map = io_data->GetHostContentSettingsMap(); - filter->Send(new ChromeViewMsg_SetContentSettingsForLoadingURL( - info->route_id(), request->url(), - map->GetContentSettings(request->url()))); - // See if the response contains the X-Auto-Login header. If so, this was // a request for a login page, and the server is allowing the browser to // suggest auto-login, if available. |