Allow an empty list of page 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/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 1061 matching lines @@
       script.set_extension_id(id());
       if (converted_from_user_script_) {
         script.set_emulate_greasemonkey(true);
         script.set_match_all_frames(true);  // greasemonkey matches all frames
       }
       content_scripts_.push_back(script);
     }
   }
 
   // Initialize page action (optional).
+  DictionaryValue* page_action_value = NULL;
+
   if (source.HasKey(keys::kPageActions)) {
     ListValue* list_value;
     if (!source.GetList(keys::kPageActions, &list_value)) {
       *error = errors::kInvalidPageActionsList;
       return false;
     }
 
-    if (list_value->GetSize() != 1u) {
+    size_t list_value_length = list_value->GetSize();
+
+    if (list_value_length == 0u) {
+      // A list with zero items is allowed, and is equivalent to not having
+      // a page_actions key in the manifest.  Don't set |page_action_value|.
+    } else if (list_value_length == 1u) {
+      if (!list_value->GetDictionary(0, &page_action_value)) {
+        *error = errors::kInvalidPageAction;
+        return false;
+      }
+    } else {  // list_value_length > 1u.
       *error = errors::kInvalidPageActionsListSize;
       return false;
     }
-
-    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));
-    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;
     }
+  }
 
+  // If page_action_value is not NULL, then there was a valid page action.
+  if (page_action_value) {
     page_action_.reset(
         LoadExtensionActionHelper(page_action_value, error));
     if (!page_action_.get())
       return false;  // Failed to parse page action definition.
   }
 
   // Initialize browser action (optional).
   if (source.HasKey(keys::kBrowserAction)) {
     // Restrict extensions to one UI surface.
-    if (source.HasKey(keys::kPageAction) || source.HasKey(keys::kPageActions)) {
+    if (page_action_.get()) {
       *error = errors::kOneUISurfaceOnly;
       return false;
     }
 
     DictionaryValue* browser_action_value;
     if (!source.GetDictionary(keys::kBrowserAction, &browser_action_value)) {
       *error = errors::kInvalidBrowserAction;
       return false;
     }
 
@@ skipping 195 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;
 }