Remove the limit of number of commands per extension, but keep the limit of 4 shortcuts per extensi…

chrome/common/extensions/api/commands/commands_handler.cc

Index: chrome/common/extensions/api/commands/commands_handler.cc
===================================================================
--- chrome/common/extensions/api/commands/commands_handler.cc	(revision 190361)
+++ chrome/common/extensions/api/commands/commands_handler.cc	(working copy)
@@ -15,9 +15,9 @@
 namespace extensions {
 
 namespace {
-// The maximum number of commands (including page action/browser actions) an
-// extension can have.
-const size_t kMaxCommandsPerExtension = 4;
+// The maximum number of commands (including page action/browser actions) with a
+// keybinding an extension can have.
+const int kMaxCommandsWithKeybindingPerExtension = 4;
 }  // namespace
 
 CommandsInfo::CommandsInfo() {
@@ -76,16 +76,10 @@
     return false;
   }
 
-  if (dict->size() > kMaxCommandsPerExtension) {
-    *error = ErrorUtils::FormatErrorMessageUTF16(
-        extension_manifest_errors::kInvalidKeyBindingTooMany,
-        base::IntToString(kMaxCommandsPerExtension));
-    return false;
-  }
-
   scoped_ptr<CommandsInfo> commands_info(new CommandsInfo);
 
   int command_index = 0;
+  int keybindings_found = 0;
   for (DictionaryValue::Iterator iter(*dict); !iter.IsAtEnd();
        iter.Advance()) {
     ++command_index;
@@ -102,6 +96,15 @@
     if (!binding->Parse(command, iter.key(), command_index, error))
       return false;  // |error| already set.
 
+    if (binding->accelerator().key_code() != ui::VKEY_UNKNOWN) {
+      if (++keybindings_found > kMaxCommandsWithKeybindingPerExtension) {
+        *error = ErrorUtils::FormatErrorMessageUTF16(
+            extension_manifest_errors::kInvalidKeyBindingTooMany,
+            base::IntToString(kMaxCommandsWithKeybindingPerExtension));
+        return false;
+      }
+    }
+
     std::string command_name = binding->command_name();
     if (command_name == extension_manifest_values::kBrowserActionCommandEvent) {
       commands_info->browser_action_command.reset(binding.release());