Integrate browser actions with the wrench menu. Browser actions

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 302 matching lines @@
 
 // Helper method that loads a PageAction or BrowserAction object from a
 // dictionary in the page_actions list or browser_action key of the manifest.
 ContextualAction* Extension::LoadContextualActionHelper(
     const DictionaryValue* page_action, int definition_index,
     std::string* error, ContextualAction::ContextualActionType action_type) {
   scoped_ptr<ContextualAction> result(new ContextualAction());
   result->set_extension_id(id());
   result->set_type(action_type);
 
-  ListValue* icons;
+  ListValue* icons = NULL;
   // Read the page action |icons|.
   if (!page_action->HasKey(keys::kPageActionIcons) ||
       !page_action->GetList(keys::kPageActionIcons, &icons) ||
       icons->GetSize() == 0) {
-    *error = ExtensionErrorUtils::FormatErrorMessage(
-        errors::kInvalidPageActionIconPaths, IntToString(definition_index));
-    return NULL;
+    // Icons are only required for page actions.
+    if (action_type == ContextualAction::PAGE_ACTION) {
+      *error = ExtensionErrorUtils::FormatErrorMessage(
+          errors::kInvalidPageActionIconPaths, IntToString(definition_index));
+      return NULL;
+    }
   }
 
   int icon_count = 0;
-  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));
-      return NULL;
+  if (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));
+        return NULL;
+      }
+
+      result->AddIconPath(path);
+      ++icon_count;
     }
-
-    result->AddIconPath(path);
-    ++icon_count;
   }
 
   if (action_type == ContextualAction::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));
@@ skipping 777 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;
 }