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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/content_settings/host_content_settings_map.cc

Issue 6350010: Put some plug-ins behind an infobar, where they have:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/renderer_host/browser_render_process_host.cc » ('j') | chrome/browser/tab_contents/tab_contents.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/content_settings/host_content_settings_map.cc
===================================================================
--- chrome/browser/content_settings/host_content_settings_map.cc (revision 72707)
+++ chrome/browser/content_settings/host_content_settings_map.cc (working copy)
@@ -296,7 +296,8 @@
} else {
// A managed default content setting has the highest priority and hence
// will overwrite any previously set value.
- if ((output.settings[j] == CONTENT_SETTING_DEFAULT) ||
+ if ((output.settings[j] == CONTENT_SETTING_DEFAULT &&
+ j != CONTENT_SETTINGS_TYPE_PLUGINS) ||
IsDefaultContentSettingManaged(ContentSettingsType(j))) {
output.settings[j] = GetDefaultContentSetting(ContentSettingsType(j));
}
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/renderer_host/browser_render_process_host.cc » ('j') | chrome/browser/tab_contents/tab_contents.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698