Index: chrome/common/extensions/extension.cc |
=================================================================== |
--- chrome/common/extensions/extension.cc (revision 29521) |
+++ chrome/common/extensions/extension.cc (working copy) |
@@ -340,12 +340,19 @@ |
result->AddIconPath(default_icon); |
} |
- // Read the page action |default_title|. |
+ // Read the page action title from |default_title| if present, |name| if not |
+ // (both optional). |
std::string title; |
- if (!page_action->GetString(keys::kName, &title) && |
- !page_action->GetString(keys::kPageActionDefaultTitle, &title)) { |
- *error = errors::kInvalidPageActionDefaultTitle; |
- return NULL; |
+ if (page_action->HasKey(keys::kPageActionDefaultTitle)) { |
+ if (!page_action->GetString(keys::kPageActionDefaultTitle, &title)) { |
+ *error = errors::kInvalidPageActionDefaultTitle; |
+ return NULL; |
+ } |
+ } else if (page_action->HasKey(keys::kName)) { |
+ if (!page_action->GetString(keys::kName, &title)) { |
+ *error = errors::kInvalidPageActionName; |
+ return NULL; |
+ } |
} |
result->set_title(title); |