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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/pref_names.h

Issue 542253003: Add a global on/off switch for content settings and expose a toggle on the Website Settings options… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@global-settings
Patch Set: Forgot UsedContentSettingsProviders(). Created 6 years, 3 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/host_content_settings_map.cc ('K') | « chrome/chrome_browser.gypi ('k') | chrome/common/pref_names.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/pref_names.h
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 26e95e79d810168b4e02c09d510e402410c3ef96..4dccde439645fa2495dfe6d231c1139c358e4b9f 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -322,6 +322,7 @@ extern const char kShowUpdatePromotionInfoBar[];
#endif
extern const char kUseCustomChromeFrame[];
extern const char kDefaultContentSettings[];
+extern const char kOverrideContentSettings[];
extern const char kContentSettingsClearOnExitMigrated[];
extern const char kContentSettingsVersion[];
extern const char kContentSettingsPatternPairs[];
« chrome/browser/content_settings/host_content_settings_map.cc ('K') | « chrome/chrome_browser.gypi ('k') | chrome/common/pref_names.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698