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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10577028: Move the mixed scripting infobar to a page action icon / content setting. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 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
« chrome/browser/content_settings/content_settings_default_provider.cc ('K') | « chrome/browser/content_settings/content_settings_utils.cc ('k') | chrome/browser/ui/browser.cc » ('j') | chrome/browser/ui/browser.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/content_settings/tab_specific_content_settings.cc
===================================================================
--- chrome/browser/content_settings/tab_specific_content_settings.cc (revision 142907)
+++ chrome/browser/content_settings/tab_specific_content_settings.cc (working copy)
@@ -199,7 +199,8 @@
content_type == CONTENT_SETTINGS_TYPE_JAVASCRIPT ||
content_type == CONTENT_SETTINGS_TYPE_PLUGINS ||
content_type == CONTENT_SETTINGS_TYPE_COOKIES ||
- content_type == CONTENT_SETTINGS_TYPE_POPUPS)
+ content_type == CONTENT_SETTINGS_TYPE_POPUPS ||
+ content_type == CONTENT_SETTINGS_TYPE_MIXEDSCRIPT)
return content_blocked_[content_type];
return false;
« chrome/browser/content_settings/content_settings_default_provider.cc ('K') | « chrome/browser/content_settings/content_settings_utils.cc ('k') | chrome/browser/ui/browser.cc » ('j') | chrome/browser/ui/browser.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698