PageActions can now specify multiple icons and switch between them...

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 37 matching lines @@
 
 int Extension::id_counter_ = 0;
 
 const char Extension::kManifestFilename[] = "manifest.json";
 
 const wchar_t* Extension::kBackgroundKey = L"background_page";
 const wchar_t* Extension::kContentScriptsKey = L"content_scripts";
 const wchar_t* Extension::kCssKey = L"css";
 const wchar_t* Extension::kDescriptionKey = L"description";
 const wchar_t* Extension::kIconPathKey = L"icon";
+const wchar_t* Extension::kIconPathsKey = L"icons";
 const wchar_t* Extension::kJsKey = L"js";
 const wchar_t* Extension::kMatchesKey = L"matches";
 const wchar_t* Extension::kNameKey = L"name";
 const wchar_t* Extension::kPageActionIdKey = L"id";
 const wchar_t* Extension::kPageActionsKey = L"page_actions";
 const wchar_t* Extension::kPermissionsKey = L"permissions";
 const wchar_t* Extension::kPluginsKey = L"plugins";
 const wchar_t* Extension::kPluginsPathKey = L"path";
 const wchar_t* Extension::kPluginsPublicKey = L"public";
 const wchar_t* Extension::kPublicKeyKey = L"key";
@@ skipping 51 matching lines @@
     "Invalid value for 'content_scripts[*].matches. There must be at least one "
     "match specified.";
 const char* Extension::kInvalidMatchError =
     "Invalid value for 'content_scripts[*].matches[*]'.";
 const char* Extension::kInvalidMatchesError =
     "Required value 'content_scripts[*].matches' is missing or invalid.";
 const char* Extension::kInvalidNameError =
     "Required value 'name' is missing or invalid.";
 const char* Extension::kInvalidPageActionError =
     "Invalid value for 'page_actions[*]'.";
+const char* Extension::kInvalidPageActionIconPathError =
+    "Invalid value for 'page_actions[*].icons[*]'.";
 const char* Extension::kInvalidPageActionsListError =
     "Invalid value for 'page_actions'.";
-const char* Extension::kInvalidPageActionIconPathError =
-    "Invalid value for 'page_actions[*].icon'.";
+const char* Extension::kInvalidPageActionIconPathsError =
+    "Required value 'page_actions[*].icons' is missing or invalid.";
 const char* Extension::kInvalidPageActionIdError =
     "Required value 'id' is missing or invalid.";
 const char* Extension::kInvalidPageActionTypeValueError =
     "Invalid value for 'page_actions[*].type', expected 'tab' or 'permanent'.";
 const char* Extension::kInvalidPermissionsError =
     "Required value 'permissions' is missing or invalid.";
 const char* Extension::kInvalidPermissionCountWarning =
     "Warning, 'permissions' key found, but array is empty.";
 const char* Extension::kInvalidPermissionError =
     "Invalid value for 'permissions[*]'.";
@@ skipping 248 matching lines @@
 }
 
 // Helper method that loads a PageAction object from a dictionary in the
 // page_action list of the manifest.
 PageAction* Extension::LoadPageActionHelper(
     const DictionaryValue* page_action, int definition_index,
     std::string* error) {
   scoped_ptr<PageAction> result(new PageAction());
   result->set_extension_id(id());
 
-  // Read the page action |icon|.
-  std::string icon;
-  if (!page_action->GetString(kIconPathKey, &icon)) {
+  ListValue* icons;
+  // Read the page action |icons|.
+  if (!page_action->HasKey(kIconPathsKey) ||
+      !page_action->GetList(kIconPathsKey, &icons) ||
+      icons->GetSize() == 0) {
     *error = ExtensionErrorUtils::FormatErrorMessage(
-        kInvalidPageActionIconPathError, IntToString(definition_index));
+        kInvalidPageActionIconPathsError, IntToString(definition_index));
     return NULL;
   }
-  FilePath icon_path = path_.AppendASCII(icon);
-  result->set_icon_path(icon_path);
+
+  int icon_count = 0;
+  for (ListValue::const_iterator iter = icons->begin();
+       iter != icons->end(); ++iter) {
+    FilePath::StringType path;
+    if (!(*iter)->GetAsString(&path) || path.empty()) {
+      *error = ExtensionErrorUtils::FormatErrorMessage(
+          kInvalidPageActionIconPathError,
+          IntToString(definition_index), IntToString(icon_count));
+      return NULL;
+    }
+
+    FilePath icon_path = path_.Append(path);
+    result->AddIconPath(icon_path);
+    ++icon_count;
+  }
 
   // Read the page action |id|.
   std::string id;
   if (!page_action->GetString(kPageActionIdKey, &id)) {
     *error = ExtensionErrorUtils::FormatErrorMessage(kInvalidPageActionIdError,
         IntToString(definition_index));
     return NULL;
   }
   result->set_id(id);
 
@@ skipping 77 matching lines @@
     return FilePath();
 
   // Double-check that the path we ended up with is actually inside the
   // extension root.
   if (!extension_path.IsParent(ret_val))
     return FilePath();
 
   return ret_val;
 }
 
-Extension::Extension(const FilePath& path) {
+Extension::Extension(const FilePath& path) : is_theme_(false) {
   DCHECK(path.IsAbsolute());
   location_ = INVALID;
 
 #if defined(OS_WIN)
   // Normalize any drive letter to upper-case. We do this for consistency with
   // net_utils::FilePathToFileURL(), which does the same thing, to make string
   // comparisons simpler.
   std::wstring path_str = path.value();
   if (path_str.size() >= 2 && path_str[0] >= L'a' && path_str[0] <= L'z' &&
       path_str[1] == ':')
@@ skipping 414 matching lines @@
          it != theme_images->end_keys(); ++it) {
       std::wstring val;
       if (theme_images->GetString(*it, &val)) {
         image_paths.insert(FilePath::FromWStringHack(val));
       }
     }
   }
 
   for (PageActionMap::const_iterator it = page_actions().begin();
        it != page_actions().end(); ++it) {
-    image_paths.insert(it->second->icon_path());
+    const std::vector<FilePath>& icon_paths = it->second->icon_paths();
+    for (std::vector<FilePath>::const_iterator iter = icon_paths.begin();
+         iter != icon_paths.end(); ++iter) {
+      image_paths.insert(*iter);
+    }
   }
 
   return image_paths;
 }