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

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

Issue 1635663002: [Extensions] Fix override urls' visible urls (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_web_ui_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_web_ui.cc
diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc
index 8c4c68b1a0b74efb2fcc99a2c89dd65d2aee2116..047dbc09a275197d6968bdc567d2e3fbc7d4e5af 100644
--- a/chrome/browser/extensions/extension_web_ui.cc
+++ b/chrome/browser/extensions/extension_web_ui.cc
@@ -448,21 +448,25 @@ bool ExtensionWebUI::HandleChromeURLOverrideReverse(
// internal URL
// chrome-extension://eemcgdkfndhakfknompkggombfjjjeno/main.html#1 to
// chrome://bookmarks/#1 for display in the omnibox.
- for (base::DictionaryValue::Iterator it(*overrides); !it.IsAtEnd();
- it.Advance()) {
- const base::ListValue* url_list = NULL;
- if (!it.value().GetAsList(&url_list))
+ for (base::DictionaryValue::Iterator dict_iter(*overrides);
+ !dict_iter.IsAtEnd(); dict_iter.Advance()) {
+ const base::ListValue* url_list = nullptr;
+ if (!dict_iter.value().GetAsList(&url_list))
continue;
- for (base::ListValue::const_iterator it2 = url_list->begin();
- it2 != url_list->end(); ++it2) {
+ for (base::ListValue::const_iterator list_iter = url_list->begin();
+ list_iter != url_list->end(); ++list_iter) {
+ const base::DictionaryValue* dict = nullptr;
+ if (!(*list_iter)->GetAsDictionary(&dict))
+ continue;
std::string override;
- if (!(*it2)->GetAsString(&override))
+ if (!dict->GetString(kEntry, &override))
continue;
if (base::StartsWith(url->spec(), override,
base::CompareCase::SENSITIVE)) {
GURL original_url(content::kChromeUIScheme + std::string("://") +
- it.key() + url->spec().substr(override.length()));
+ dict_iter.key() +
+ url->spec().substr(override.length()));
*url = original_url;
return true;
}
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_web_ui_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698