Update page action manifest parsing to match the new format.

Preserves backwards compatability with the old manifest format.

BUG=24635

Review URL: http://codereview.chromium.org/275007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28912 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 12 insertions, 21 deletions

diff --git a/chrome/browser/extensions/extension_browser_actions_api.cc b/chrome/browser/extensions/extension_browser_actions_api.cc
index 75ec089..0a94026 100644
--- a/chrome/browser/extensions/extension_browser_actions_api.cc
+++ b/chrome/browser/extensions/extension_browser_actions_api.cc
@@ -28,8 +28,8 @@ const char kIconIndexOutOfBounds[] =
 }
 
 bool BrowserActionSetNameFunction::RunImpl() {
-  std::string name;
-  EXTENSION_FUNCTION_VALIDATE(args_->GetAsString(&name));
+  std::string title;
+  EXTENSION_FUNCTION_VALIDATE(args_->GetAsString(&title));
 
   Extension* extension = dispatcher()->GetExtension();
   if (!extension->browser_action()) {
@@ -37,7 +37,7 @@ bool BrowserActionSetNameFunction::RunImpl() {
     return false;
   }
 
-  extension->browser_action_state()->set_title(name);
+  extension->browser_action_state()->set_title(title);
 
   NotificationService::current()->Notify(
       NotificationType::EXTENSION_BROWSER_ACTION_UPDATED,
diff --git a/chrome/browser/extensions/extension_browser_event_router.cc b/chrome/browser/extensions/extension_browser_event_router.cc
index 8e98d2f..3604942 100644
--- a/chrome/browser/extensions/extension_browser_event_router.cc
+++ b/chrome/browser/extensions/extension_browser_event_router.cc
@@ -370,7 +370,7 @@ void ExtensionBrowserEventRouter::PageActionExecuted(
   std::string json_args;
   JSONWriter::Write(&args, false, &json_args);
 
-  std::string event_name = extension_id + std::string("/") + page_action_id;
+  std::string event_name = std::string("pageAction/") + extension_id;
   DispatchEvent(profile, event_name.c_str(), json_args);
 }
 
diff --git a/chrome/browser/extensions/extension_file_util.cc b/chrome/browser/extensions/extension_file_util.cc
index 1b6f474..638052d5 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) {
diff --git a/chrome/browser/extensions/extension_page_actions_module.cc b/chrome/browser/extensions/extension_page_actions_module.cc
index 446a91d..51866e3 100644
--- a/chrome/browser/extensions/extension_page_actions_module.cc
+++ b/chrome/browser/extensions/extension_page_actions_module.cc
@@ -71,9 +71,7 @@ bool PageActionFunction::SetPageActionEnabled(bool enable) {
     return false;
   }
 
-  const ExtensionAction* page_action =
-      extension->GetExtensionAction(page_action_id,
-                                    ExtensionAction::PAGE_ACTION);
+  const ExtensionAction* page_action = extension->page_action();
   if (!page_action) {
     error_ = ExtensionErrorUtils::FormatErrorMessage(keys::kNoPageActionError,
                                                      page_action_id);
diff --git a/chrome/browser/extensions/extension_process_manager.cc b/chrome/browser/extensions/extension_process_manager.cc
index 9ae47a7..e9bb7c49 100644
--- a/chrome/browser/extensions/extension_process_manager.cc
+++ b/chrome/browser/extensions/extension_process_manager.cc
@@ -130,11 +130,8 @@ void ExtensionProcessManager::RegisterExtensionProcess(
 
   std::vector<std::string> page_action_ids;
   Extension* extension = extension_service->GetExtensionById(extension_id);
-  for (ExtensionActionMap::const_iterator i =
-           extension->page_actions().begin();
-       i != extension->page_actions().end(); ++i) {
-    page_action_ids.push_back(i->first);
-  }
+  if (extension->page_action())
+    page_action_ids.push_back(extension->page_action()->id());
 
   RenderProcessHost* rph = RenderProcessHost::FromID(process_id);
   rph->Send(new ViewMsg_Extension_UpdatePageActions(extension_id,
diff --git a/chrome/browser/extensions/extensions_service.cc b/chrome/browser/extensions/extensions_service.cc
index f65e6ff..0ff31f8 100644
--- a/chrome/browser/extensions/extensions_service.cc
+++ b/chrome/browser/extensions/extensions_service.cc
@@ -374,11 +374,9 @@ std::vector<ExtensionAction*> ExtensionsService::GetExtensionActions(
   for (ExtensionList::const_iterator iter = extensions_.begin();
        iter != extensions_.end(); ++iter) {
     if (action_type == ExtensionAction::PAGE_ACTION) {
-      const ExtensionActionMap* page_actions = &(*iter)->page_actions();
-      for (ExtensionActionMap::const_iterator i(page_actions->begin());
-           i != page_actions->end(); ++i) {
-        if (include_popups || !i->second->is_popup())
-          result.push_back(i->second);
+      ExtensionAction* page_action = (*iter)->page_action();
+      if (page_action && (include_popups || !page_action->is_popup())) {
+        result.push_back(page_action);
       }
     } else {
       ExtensionAction* browser_action = (*iter)->browser_action();