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

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

Issue 6721021: Move a bunch of renderer->browser messages to content. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 months 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
Index: content/browser/renderer_host/render_message_filter.cc
===================================================================
--- content/browser/renderer_host/render_message_filter.cc (revision 79131)
+++ content/browser/renderer_host/render_message_filter.cc (working copy)
@@ -692,7 +692,7 @@
const std::string& actual_mime_type,
const GURL& policy_url,
IPC::Message* reply_msg) {
- ContentSetting setting = CONTENT_SETTING_DEFAULT;
+ int content_setting = CONTENT_SETTING_DEFAULT;
webkit::npapi::WebPluginInfo info_copy = info;
if (found) {
// TODO(mpcomplete): The plugin service should do this check. We should
@@ -703,14 +703,14 @@
std::string resource =
webkit::npapi::PluginList::Singleton()->GetPluginGroupIdentifier(
info_copy);
- setting = content_settings_->GetContentSetting(
+ content_setting = content_settings_->GetContentSetting(
policy_url,
CONTENT_SETTINGS_TYPE_PLUGINS,
resource);
}
ViewHostMsg_GetPluginInfo::WriteReplyParams(
- reply_msg, found, info_copy, setting, actual_mime_type);
+ reply_msg, found, info_copy, content_setting, actual_mime_type);
Send(reply_msg);
}

Powered by Google App Engine
This is Rietveld 408576698