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) { |