Implement Keybinding for script badges.

chrome/common/extensions/command.cc

 // Copyright (c) 2012 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/command.h"
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/values.h"
@@ skipping 213 matching lines @@
           iter->second);
       return false;
     }
 
     if (iter->first == key) {
       // This platform is our platform, so grab this key.
       accelerator_ = accelerator;
       command_name_ = command_name;
 
       if (command_name !=
-              extension_manifest_values::kPageActionKeybindingEvent &&
+              extension_manifest_values::kPageActionCommandEvent &&
           command_name !=
-              extension_manifest_values::kBrowserActionKeybindingEvent) {
+              extension_manifest_values::kBrowserActionCommandEvent &&
+          command_name !=
+              extension_manifest_values::kScriptBadgeCommandEvent) {
         if (!command->GetString(keys::kDescription, &description_) ||
             description_.empty()) {
           *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
               errors::kInvalidKeyBindingDescription,
               base::IntToString(index));
           return false;
         }
       }
     }
   }
   return true;
 }
 
 DictionaryValue* Command::ToValue(const Extension* extension,
                                   bool active) const {
   DictionaryValue* extension_data = new DictionaryValue();
 
   string16 command_description;
-  if (command_name() == values::kBrowserActionKeybindingEvent ||
-      command_name() == values::kPageActionKeybindingEvent) {
+  if (command_name() == values::kBrowserActionCommandEvent ||
+      command_name() == values::kPageActionCommandEvent ||
+      command_name() == values::kScriptBadgeCommandEvent) {
     command_description =
         l10n_util::GetStringUTF16(IDS_EXTENSION_COMMANDS_GENERIC_ACTIVATE);
   } else {
     command_description = description();
   }
   extension_data->SetString("description", command_description);
   extension_data->SetBoolean("active", active);
   extension_data->SetString("keybinding", accelerator().GetShortcutText());
   extension_data->SetString("command_name", command_name());
   extension_data->SetString("extension_id", extension->id());
 
   return extension_data;
 }
 
 }  // namespace extensions