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

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

Issue 2577043002: Fix content settings for hosted apps not displayed correctly. (Closed)
Patch Set: add tests to verify kDisplayName is set for exceptions and exceptions for hosted apps 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.cc
diff --git a/chrome/browser/ui/webui/site_settings_helper.cc b/chrome/browser/ui/webui/site_settings_helper.cc
index ef0a5fedc8f58568ca53a79cd1e53c0ad4b9ee87..9cba22abfd04ee6ac816c1de3068fc77ed24cad0 100644
--- a/chrome/browser/ui/webui/site_settings_helper.cc
+++ b/chrome/browser/ui/webui/site_settings_helper.cc
@@ -118,6 +118,7 @@ void AddExceptionForHostedApp(const std::string& url_pattern,
exception->SetString(site_settings::kSetting, setting_string);
exception->SetString(site_settings::kOrigin, url_pattern);
+ exception->SetString(site_settings::kDisplayName, url_pattern);
exception->SetString(site_settings::kEmbeddingOrigin, url_pattern);
exception->SetString(site_settings::kSource, "HostedApp");
exception->SetBoolean(site_settings::kIncognito, false);
@@ -355,6 +356,7 @@ std::unique_ptr<base::DictionaryValue> GetChooserExceptionForPage(
exception->SetString(site_settings::kSetting, setting_string);
exception->SetString(site_settings::kOrigin, requesting_origin.spec());
+ exception->SetString(site_settings::kDisplayName, requesting_origin.spec());
exception->SetString(
site_settings::kEmbeddingOrigin, embedding_origin.spec());
exception->SetString(site_settings::kSource, provider_name);

Powered by Google App Engine
This is Rietveld 408576698