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

Unified Diff: chrome/browser/ui/webui/site_settings_helper.h

Issue 2525943002: Display content settings for extensions with extension name. (Closed)
Patch Set: deduplicate by origin Created 4 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
Index: chrome/browser/ui/webui/site_settings_helper.h
diff --git a/chrome/browser/ui/webui/site_settings_helper.h b/chrome/browser/ui/webui/site_settings_helper.h
index efda954012af6e88e11be2439129f82f143da29b..4bb415ab252ebfd3800df947eedd9708089346cb 100644
--- a/chrome/browser/ui/webui/site_settings_helper.h
+++ b/chrome/browser/ui/webui/site_settings_helper.h
@@ -26,6 +26,10 @@ class DictionaryValue;
class ListValue;
}
+namespace extensions {
+class ExtensionRegistry;
+}
+
namespace site_settings {
// Maps from a secondary pattern to a setting.
@@ -39,6 +43,8 @@ typedef std::map<std::pair<ContentSettingsPattern, std::string>,
extern const char kSetting[];
extern const char kOrigin[];
+extern const char kDisplayName[];
+extern const char kOriginForFavicon[];
extern const char kPolicyProviderId[];
extern const char kSource[];
extern const char kIncognito[];
@@ -61,6 +67,7 @@ std::string ContentSettingsTypeToGroupName(ContentSettingsType type);
std::unique_ptr<base::DictionaryValue> GetExceptionForPage(
const ContentSettingsPattern& pattern,
const ContentSettingsPattern& secondary_pattern,
+ const std::string& display_name,
const ContentSetting& setting,
const std::string& provider_name,
bool incognito);
@@ -75,6 +82,7 @@ void AddExceptionForHostedApp(const std::string& url_pattern,
void GetExceptionsFromHostContentSettingsMap(
const HostContentSettingsMap* map,
ContentSettingsType type,
+ const extensions::ExtensionRegistry* extension_registry,
content::WebUI* web_ui,
bool incognito,
const std::string* filter,
@@ -85,6 +93,7 @@ void GetExceptionsFromHostContentSettingsMap(
void GetPolicyAllowedUrls(
ContentSettingsType type,
std::vector<std::unique_ptr<base::DictionaryValue>>* exceptions,
+ const extensions::ExtensionRegistry* extension_registry,
content::WebUI* web_ui,
bool incognito);
« no previous file with comments | « chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc ('k') | chrome/browser/ui/webui/site_settings_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698