| Index: chrome/common/extensions/extension.cc
|
| diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
|
| index f042c988ef4d6158bd44f2c49a9bb95d9b5d4642..1b3e947a1b50a4fadc104b8175c0f88978ceaca4 100644
|
| --- a/chrome/common/extensions/extension.cc
|
| +++ b/chrome/common/extensions/extension.cc
|
| @@ -3243,7 +3243,7 @@ std::set<FilePath> Extension::GetBrowserImages() const {
|
| }
|
| }
|
|
|
| - if (page_action()) {
|
| + if (page_action() && page_action()->default_icon()) {
|
| for (ExtensionIconSet::IconMap::const_iterator iter =
|
| page_action()->default_icon()->map().begin();
|
| iter != page_action()->default_icon()->map().end();
|
| @@ -3252,7 +3252,7 @@ std::set<FilePath> Extension::GetBrowserImages() const {
|
| }
|
| }
|
|
|
| - if (browser_action()) {
|
| + if (browser_action() && browser_action()->default_icon()) {
|
| for (ExtensionIconSet::IconMap::const_iterator iter =
|
| browser_action()->default_icon()->map().begin();
|
| iter != browser_action()->default_icon()->map().end();
|
|
|