Update page action manifest parsing to match the new format.

chrome/common/extensions/extension.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/extension.h"
 
 #include "app/resource_bundle.h"
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 86 matching lines @@
 };
 
 const char* Extension::kPermissionNames[] = {
   "tabs",
   "bookmarks",
 };
 const size_t Extension::kNumPermissions =
     arraysize(Extension::kPermissionNames);
 
 Extension::~Extension() {
-  STLDeleteValues(&page_actions_);
 }
 
 const std::string Extension::VersionString() const {
   return version_->GetString();
 }
 
 // static
 bool Extension::IsExtension(const FilePath& file_name) {
   return file_name.MatchesExtension(
       FilePath::StringType(FILE_PATH_LITERAL(".")) +
@@ skipping 21 matching lines @@
                                const std::string& relative_path) {
   DCHECK(extension_url.SchemeIs(chrome::kExtensionScheme));
   DCHECK(extension_url.path() == "/");
 
   GURL ret_val = GURL(extension_url.spec() + relative_path);
   DCHECK(StartsWithASCII(ret_val.spec(), extension_url.spec(), false));
 
   return ret_val;
 }
 
-const ExtensionAction* Extension::GetExtensionAction(
-    std::string id, ExtensionAction::ExtensionActionType action_type) const {
-  if (action_type == ExtensionAction::BROWSER_ACTION) {
-    DCHECK(id.empty());  // Multiple browser actions are not allowed.
-    return browser_action_.get();
-  } else {
-    ExtensionActionMap::const_iterator it = page_actions_.find(id);
-    if (it == page_actions_.end())
-      return NULL;
-
-    return it->second;
-  }
-}
-
 Extension::Location Extension::ExternalExtensionInstallType(
     std::string registry_path) {
 #if defined(OS_WIN)
   HKEY reg_root = HKEY_LOCAL_MACHINE;
   RegKey key;
   registry_path.append("\\");
   registry_path.append(id_);
   if (key.Open(reg_root, ASCIIToWide(registry_path).c_str()))
     return Extension::EXTERNAL_REGISTRY;
 #endif
@@ skipping 130 matching lines @@
       result->css_scripts().push_back(UserScript::File(resource, url));
     }
   }
 
   return true;
 }
 
 // Helper method that loads a PageAction or BrowserAction object from a
 // dictionary in the page_actions list or browser_action key of the manifest.
 ExtensionAction* Extension::LoadExtensionActionHelper(
-    const DictionaryValue* page_action, int definition_index,
-    std::string* error, ExtensionAction::ExtensionActionType action_type) {
+    const DictionaryValue* page_action, std::string* error,
+    ExtensionAction::ExtensionActionType action_type) {
   scoped_ptr<ExtensionAction> result(new ExtensionAction());
   result->set_extension_id(id());
   result->set_type(action_type);
 
+  // TODO(EXTENSIONS_DEPRECATED): icons list is obsolete.
   ListValue* icons = NULL;
-  // Read the page action |icons|.
-  if (!page_action->HasKey(keys::kPageActionIcons) ||
-      !page_action->GetList(keys::kPageActionIcons, &icons) ||
-      icons->GetSize() == 0) {
-    // Icons are only required for page actions.
-    if (action_type == ExtensionAction::PAGE_ACTION) {
-      *error = ExtensionErrorUtils::FormatErrorMessage(
-          errors::kInvalidPageActionIconPaths, IntToString(definition_index));
-      return NULL;
-    }
-  }
-
-  int icon_count = 0;
-  if (icons) {
+  if (page_action->HasKey(keys::kPageActionIcons) &&
+      page_action->GetList(keys::kPageActionIcons, &icons)) {
     for (ListValue::const_iterator iter = icons->begin();
          iter != icons->end(); ++iter) {
       std::string path;
       if (!(*iter)->GetAsString(&path) || path.empty()) {
-        *error = ExtensionErrorUtils::FormatErrorMessage(
-            errors::kInvalidPageActionIconPath,
-            IntToString(definition_index), IntToString(icon_count));
+        *error = errors::kInvalidPageActionIconPath;
         return NULL;
       }
 
       result->AddIconPath(path);
-      ++icon_count;
     }
   }
 
-  if (action_type == ExtensionAction::BROWSER_ACTION) {
-    result->set_id("");  // Not needed (only 1 browser action per extension).
-  } else {
-    // Read the page action |id|.
-    std::string id;
-    if (!page_action->GetString(keys::kPageActionId, &id)) {
-      *error = ExtensionErrorUtils::FormatErrorMessage(
-          errors::kInvalidPageActionId, IntToString(definition_index));
+  // TODO(EXTENSIONS_DEPRECATED): Read the page action |id| (optional).
+  std::string id;
+  if (action_type == ExtensionAction::PAGE_ACTION)
+    page_action->GetString(keys::kPageActionId, &id);
+  result->set_id(id);
+
+  std::string default_icon;
+  // Read the page action |default_icon| (optional).
+  if (page_action->HasKey(keys::kPageActionDefaultIcon)) {
+    if (!page_action->GetString(keys::kPageActionDefaultIcon, &default_icon) ||
+        default_icon.empty()) {
+      *error = errors::kInvalidPageActionIconPath;
       return NULL;
     }
-    result->set_id(id);
+    // TODO(EXTENSIONS_DEPRECATED): one icon.
+    result->AddIconPath(default_icon);
   }
 
-  // Read the page action |name|.
-  std::string name;
-  if (!page_action->GetString(keys::kName, &name)) {
-    *error = ExtensionErrorUtils::FormatErrorMessage(errors::kInvalidName,
-        IntToString(definition_index));
+  // Read the page action |default_title|.
+  std::string title;
+  if (!page_action->GetString(keys::kName, &title) &&
+      !page_action->GetString(keys::kPageActionDefaultTitle, &title)) {
+    *error = errors::kInvalidPageActionDefaultTitle;
     return NULL;
   }
-  result->set_name(name);
+  result->set_title(title);
 
   // Read the action's |popup| (optional).
   DictionaryValue* popup = NULL;
+  std::string url_str;
   if (page_action->HasKey(keys::kPageActionPopup) &&
-     !page_action->GetDictionary(keys::kPageActionPopup, &popup)) {
+     !page_action->GetDictionary(keys::kPageActionPopup, &popup) &&
+     !page_action->GetString(keys::kPageActionPopup, &url_str)) {
     *error = errors::kInvalidPageActionPopup;
     return NULL;
   }
   if (popup) {
-    std::string url_str;
+    // TODO(EXTENSIONS_DEPRECATED): popup is a string only
     if (!popup->GetString(keys::kPageActionPopupPath, &url_str)) {
       *error = ExtensionErrorUtils::FormatErrorMessage(
           errors::kInvalidPageActionPopupPath, "<missing>");
       return NULL;
     }
     GURL url = GetResourceURL(url_str);
     if (!url.is_valid()) {
       *error = ExtensionErrorUtils::FormatErrorMessage(
           errors::kInvalidPageActionPopupPath, url_str);
       return NULL;
     }
     result->set_popup_url(url);
 
     int height;
     if (!popup->GetInteger(keys::kPageActionPopupHeight, &height)) {
       *error = ExtensionErrorUtils::FormatErrorMessage(
           errors::kInvalidPageActionPopupHeight, "<missing>");
       return NULL;
     }
     result->set_popup_height(height);
+  } else if (!url_str.empty()) {
+    GURL url = GetResourceURL(url_str);
+    if (!url.is_valid()) {
+      *error = ExtensionErrorUtils::FormatErrorMessage(
+          errors::kInvalidPageActionPopupPath, url_str);
+      return NULL;
+    }
+    result->set_popup_url(url);
+    // TODO(erikkay): Need dynamic sizing of popups.
+    // http://code.google.com/p/chromium/issues/detail?id=24471
+    result->set_popup_height(100);
   }
 
   return result.release();
 }
 
 bool Extension::ContainsNonThemeKeys(const DictionaryValue& source) {
   // Generate a map of allowable keys
   static std::map<std::wstring, bool> theme_keys;
   static bool theme_key_mapped = false;
   if (!theme_key_mapped) {
@@ skipping 512 matching lines @@
       }
 
       UserScript script;
       if (!LoadUserScriptHelper(content_script, i, error, &script))
         return false;  // Failed to parse script context definition
       script.set_extension_id(id());
       content_scripts_.push_back(script);
     }
   }
 
-  // Initialize page actions (optional).
+  // Initialize page action (optional).
   if (source.HasKey(keys::kPageActions)) {
     ListValue* list_value;
     if (!source.GetList(keys::kPageActions, &list_value)) {
       *error = errors::kInvalidPageActionsList;
       return false;
     }
 
-    for (size_t i = 0; i < list_value->GetSize(); ++i) {
-      DictionaryValue* page_action_value;
-      if (!list_value->GetDictionary(i, &page_action_value)) {
-        *error = ExtensionErrorUtils::FormatErrorMessage(
-            errors::kInvalidPageAction, IntToString(i));
-        return false;
-      }
+    if (list_value->GetSize() != 1u) {
+      *error = errors::kInvalidPageActionsListSize;
+      return false;
+    }
 
-      ExtensionAction* contextual_action =
-          LoadExtensionActionHelper(page_action_value, i, error,
-                                    ExtensionAction::PAGE_ACTION);
-      if (!contextual_action)
-        return false;  // Failed to parse page action definition.
-      page_actions_[contextual_action->id()] = contextual_action;
+    DictionaryValue* page_action_value;
+    if (!list_value->GetDictionary(0, &page_action_value)) {
+      *error = errors::kInvalidPageAction;
+      return false;
     }
+
+    page_action_.reset(
+        LoadExtensionActionHelper(page_action_value, error,
+                                  ExtensionAction::PAGE_ACTION));
+    if (!page_action_.get())
+      return false;  // Failed to parse page action definition.
+  } else if (source.HasKey(keys::kPageAction)) {
+    DictionaryValue* page_action_value;
+    if (!source.GetDictionary(keys::kPageAction, &page_action_value)) {
+      *error = errors::kInvalidPageAction;
+      return false;
+    }
+
+    page_action_.reset(
+        LoadExtensionActionHelper(page_action_value, error,
+                                  ExtensionAction::PAGE_ACTION));
+    if (!page_action_.get())
+      return false;  // Failed to parse page action definition.
   }
 
+  // Initialize browser action (optional).
   if (source.HasKey(keys::kBrowserAction)) {
     DictionaryValue* browser_action_value;
     if (!source.GetDictionary(keys::kBrowserAction, &browser_action_value)) {
-      *error = ExtensionErrorUtils::FormatErrorMessage(
-          errors::kInvalidBrowserAction, "");
+      *error = errors::kInvalidBrowserAction;
       return false;
     }
 
     browser_action_.reset(
-        LoadExtensionActionHelper(browser_action_value, 0, error,
+        LoadExtensionActionHelper(browser_action_value, error,
                                   ExtensionAction::BROWSER_ACTION));
     if (!browser_action_.get())
       return false;  // Failed to parse browser action definition.
 
     browser_action_state_.reset(
-        new ExtensionActionState(browser_action_->name(), 0));
+        new ExtensionActionState(browser_action_->title(), 0));
   }
 
   // Initialize the permissions (optional).
   if (source.HasKey(keys::kPermissions)) {
     ListValue* permissions = NULL;
     if (!source.GetList(keys::kPermissions, &permissions)) {
       *error = ExtensionErrorUtils::FormatErrorMessage(
           errors::kInvalidPermissions, "");
       return false;
     }
@@ skipping 85 matching lines @@
     for (DictionaryValue::key_iterator it = theme_images->begin_keys();
          it != theme_images->end_keys(); ++it) {
       std::wstring val;
       if (theme_images->GetString(*it, &val)) {
         image_paths.insert(FilePath::FromWStringHack(val));
       }
     }
   }
 
   // page action icons
-  for (ExtensionActionMap::const_iterator it = page_actions().begin();
-       it != page_actions().end(); ++it) {
-    const std::vector<std::string>& icon_paths = it->second->icon_paths();
+  if (page_action_.get()) {
+    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) {
       image_paths.insert(FilePath::FromWStringHack(UTF8ToWide(*iter)));
+    }
+  }
+
+  // browser action icons
+  if (browser_action_.get()) {
+    const std::vector<std::string>& icon_paths = browser_action_->icon_paths();
+    for (std::vector<std::string>::const_iterator iter = icon_paths.begin();
+         iter != icon_paths.end(); ++iter) {
+      image_paths.insert(FilePath::FromWStringHack(UTF8ToWide(*iter)));
     }
   }
 
   return image_paths;
 }
 
 bool Extension::GetBackgroundPageReady() {
   return background_page_ready_ || background_url().is_empty();
 }
 
@@ skipping 54 matching lines @@
     UserScript::PatternList::const_iterator pattern =
         content_script->url_patterns().begin();
     for (; pattern != content_script->url_patterns().end(); ++pattern) {
       if (pattern->match_subdomains() && pattern->host().empty())
         return true;
     }
   }
 
   return false;
 }