Experimental Extension Keybinding (first cut).

chrome/common/extensions/extension.h

 // 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.
 
 #ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_H_
 #define CHROME_COMMON_EXTENSIONS_EXTENSION_H_
 #pragma once
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/hash_tables.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_permission_set.h"
 #include "chrome/common/extensions/manifest.h"
 #include "chrome/common/extensions/user_script.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "chrome/common/extensions/url_pattern_set.h"
 #include "googleurl/src/gurl.h"
+#include "ui/base/accelerators/accelerator.h"
 #include "ui/gfx/size.h"
 
 class ExtensionAction;
 class ExtensionResource;
 class FileBrowserHandler;
 class SkBitmap;
 class Version;
 
 namespace base {
 class DictionaryValue;
@@ skipping 107 matching lines @@
     std::string id;
     std::string description;
     std::string language;
     std::set<std::string> layouts;
     std::string shortcut_keycode;
     bool shortcut_alt;
     bool shortcut_ctrl;
     bool shortcut_shift;
   };
 
+  class ExtensionKeybinding {
+   public:
+    // Define out of line constructor/destructor to please Clang.
+    ExtensionKeybinding();
+    ~ExtensionKeybinding();
+
+    // Parse the key binding.
+    bool Parse(base::DictionaryValue* command,
+               const std::string& event_name,
+               string16* error,
+               int index);
+
+    // Accessors:
+    const std::string& event_name() const { return event_name_; }

[Matt Perry, 2012/02/21 23:13:39]

event_name sounds like the name of the event that the extension adds a listener
to. How about command_name?

+    const ui::Accelerator& accelerator() const { return accelerator_; }
+    const std::string& description() const { return description_; }
+
+   private:
+    std::string event_name_;
+    ui::Accelerator accelerator_;
+    std::string description_;
+  };
+
   struct TtsVoice {
     // Define out of line constructor/destructor to please Clang.
     TtsVoice();
     ~TtsVoice();
 
     std::string voice_name;
     std::string lang;
     std::string gender;
     std::set<std::string> event_types;
   };
@@ skipping 360 matching lines @@
   const FileBrowserHandlerList* file_browser_handlers() const {
     return file_browser_handlers_.get();
   }
   const std::vector<PluginInfo>& plugins() const { return plugins_; }
   const std::vector<NaClModuleInfo>& nacl_modules() const {
     return nacl_modules_;
   }
   const std::vector<InputComponentInfo>& input_components() const {
     return input_components_;
   }
+  const std::vector<ExtensionKeybinding>& keybindings() const {
+    return commands_;
+  }
   bool has_background_page() const {
     return background_url_.is_valid() || !background_scripts_.empty();
   }
   const std::vector<std::string>& background_scripts() const {
     return background_scripts_;
   }
   bool background_page_persists() const { return background_page_persists_; }
   const GURL& options_url() const { return options_url_; }
   const GURL& devtools_url() const { return devtools_url_; }
   const ExtensionPermissionSet* optional_permission_set() const {
@@ skipping 256 matching lines @@
 
   // Optional list of NPAPI plugins and associated properties.
   std::vector<PluginInfo> plugins_;
 
   // Optional list of NaCl modules and associated properties.
   std::vector<NaClModuleInfo> nacl_modules_;
 
   // Optional list of input components and associated properties.
   std::vector<InputComponentInfo> input_components_;
 
+  // Optional list of commands (keyboard shortcuts).
+  std::vector<ExtensionKeybinding> commands_;
+
   // Optional list of web accessible extension resources.
   base::hash_set<std::string> web_accessible_resources_;
 
   // Optional URL to a master page of which a single instance should be always
   // loaded in the background.
   GURL background_url_;
 
   // Optional list of scripts to use to generate a background page. If this is
   // present, background_url_ will be empty and generated by GetBackgroundURL().
   std::vector<std::string> background_scripts_;
@@ skipping 119 matching lines @@
   const Extension* extension;
 
   UnloadedExtensionInfo(
       const Extension* extension,
       extension_misc::UnloadedExtensionReason reason);
 };
 
 // The details sent for EXTENSION_PERMISSIONS_UPDATED notifications.
 struct UpdatedExtensionPermissionsInfo {
   enum Reason {
-    ADDED,   // The permissions were added to the extension.
-    REMOVED, // The permissions were removed from the extension.
+    ADDED,    // The permissions were added to the extension.
+    REMOVED,  // The permissions were removed from the extension.
   };
 
   Reason reason;
 
   // The extension who's permissions have changed.
   const Extension* extension;
 
   // The permissions that have changed. For Reason::ADDED, this would contain
   // only the permissions that have added, and for Reason::REMOVED, this would
   // only contain the removed permissions.
   const ExtensionPermissionSet* permissions;
 
   UpdatedExtensionPermissionsInfo(
       const Extension* extension,
       const ExtensionPermissionSet* permissions,
       Reason reason);
 };
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_H_