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

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

Issue 275007: Update page action manifest parsing to match the new format. (Closed)
Patch Set: cleanup Created 11 years, 2 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_file_util.cc
diff --git a/chrome/browser/extensions/extension_file_util.cc b/chrome/browser/extensions/extension_file_util.cc
index 1b6f47415e409a6d6c2d9c796870ad8d0bd927ca..638052d5cae45024745b65c4c7ce04beb11223a4 100644
--- a/chrome/browser/extensions/extension_file_util.cc
+++ b/chrome/browser/extensions/extension_file_util.cc
@@ -226,10 +226,8 @@ bool ValidateExtension(Extension* extension, std::string* error) {
}
// Validate icon location for page actions.
- const ExtensionActionMap& page_actions = extension->page_actions();
- for (ExtensionActionMap::const_iterator i(page_actions.begin());
- i != page_actions.end(); ++i) {
- ExtensionAction* page_action = i->second;
+ const ExtensionAction* page_action = extension->page_action();
+ if (page_action) {
const std::vector<std::string>& icon_paths = page_action->icon_paths();
for (std::vector<std::string>::const_iterator iter = icon_paths.begin();
iter != icon_paths.end(); ++iter) {

Powered by Google App Engine
This is Rietveld 408576698