Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(764)

Unified Diff: chrome/browser/renderer_host/render_message_filter.cc

Issue 5785004: Store HostContentSettingsMap separately so we can access it from the IO thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: compile fix Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/renderer_host/render_message_filter.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/renderer_host/render_message_filter.cc
diff --git a/chrome/browser/renderer_host/render_message_filter.cc b/chrome/browser/renderer_host/render_message_filter.cc
index 5fa92ec271e56a143b3d57e126bc72ae8bb79d9f..05b40aa9f49d6ed2d84b94cfa56b01a27d62b8b0 100644
--- a/chrome/browser/renderer_host/render_message_filter.cc
+++ b/chrome/browser/renderer_host/render_message_filter.cc
@@ -240,6 +240,7 @@ RenderMessageFilter::RenderMessageFilter(
plugin_service_(plugin_service),
print_job_manager_(print_job_manager),
profile_(profile),
+ content_settings_(profile->GetHostContentSettingsMap()),
ALLOW_THIS_IN_INITIALIZER_LIST(resolve_proxy_msg_helper_(this, NULL)),
media_request_context_(profile->GetRequestContextForMedia()),
extensions_request_context_(profile->GetRequestContextForExtensions()),
@@ -578,7 +579,9 @@ void RenderMessageFilter::OnSetCookie(const IPC::Message& message,
// If this render view is associated with an automation channel, aka
// ChromeFrame then we need to set cookies in the external host.
- if (!AutomationResourceMessageFilter::SetCookiesForUrl(url, cookie, callback)) {
+ if (!AutomationResourceMessageFilter::SetCookiesForUrl(url,
+ cookie,
+ callback)) {
int policy = net::OK;
if (context->cookie_policy()) {
policy = context->cookie_policy()->CanSetCookie(
@@ -787,12 +790,12 @@ void RenderMessageFilter::OnGotPluginInfo(bool found,
if (found) {
info_copy.enabled = info_copy.enabled &&
plugin_service_->PrivatePluginAllowedForURL(info_copy.path, policy_url);
- HostContentSettingsMap* map = profile_->GetHostContentSettingsMap();
std::string resource =
NPAPI::PluginList::Singleton()->GetPluginGroupIdentifier(info_copy);
- setting = map->GetContentSetting(policy_url,
- CONTENT_SETTINGS_TYPE_PLUGINS,
- resource);
+ setting = content_settings_->GetContentSetting(
+ policy_url,
+ CONTENT_SETTINGS_TYPE_PLUGINS,
+ resource);
}
ViewHostMsg_GetPluginInfo::WriteReplyParams(
« no previous file with comments | « chrome/browser/renderer_host/render_message_filter.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698