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

Unified Diff: chrome/browser/extensions/extension_management_internal.cc

Issue 2495353003: chrome.webRequest support for ExtensionSettings (Closed)
Patch Set: Policy template translation doesn't like '&', switching to 'and'. Small fix to browser test. Created 3 years, 7 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
Index: chrome/browser/extensions/extension_management_internal.cc
diff --git a/chrome/browser/extensions/extension_management_internal.cc b/chrome/browser/extensions/extension_management_internal.cc
index f9cf06e630fad927fa23ffd997a570f925f8b511..4575d277961b0f693d1319abf466532383b1ec6f 100644
--- a/chrome/browser/extensions/extension_management_internal.cc
+++ b/chrome/browser/extensions/extension_management_internal.cc
@@ -133,8 +133,15 @@ bool IndividualSettings::Parse(const base::DictionaryValue* dict,
std::string unparsed_str;
host_list_value->GetString(i, &unparsed_str);
URLPattern pattern = URLPattern(extension_scheme_mask);
- URLPattern::ParseResult parse_result = pattern.Parse(
- unparsed_str, URLPattern::ALLOW_WILDCARD_FOR_EFFECTIVE_TLD);
+ URLPattern::ParseResult parse_result;
+ if (unparsed_str == "<all_urls>") {
+ parse_result = pattern.Parse(
+ unparsed_str, URLPattern::ALLOW_WILDCARD_FOR_EFFECTIVE_TLD);
+ } else {
+ parse_result =
+ pattern.Parse(unparsed_str + "/*",
+ URLPattern::ALLOW_WILDCARD_FOR_EFFECTIVE_TLD);
+ }
if (parse_result != URLPattern::PARSE_SUCCESS) {
LOG(WARNING) << kMalformedPreferenceWarning;
LOG(WARNING) << "Invalid URL pattern '" + unparsed_str +

Powered by Google App Engine
This is Rietveld 408576698