Move Command class out of the Extension class and into its own location (under chrome/common/exten…

chrome/browser/extensions/api/commands/extension_command_service.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_BROWSER_EXTENSIONS_API_COMMANDS_EXTENSION_COMMAND_SERVICE_H_
 #define CHROME_BROWSER_EXTENSIONS_API_COMMANDS_EXTENSION_COMMAND_SERVICE_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_commands.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 
 class PrefService;
 class Profile;
 
 namespace ui {
   class Accelerator;
 }
 
 // This service keeps track of preferences related to extension commands
 // (assigning initial keybindings on install and removing them on deletion
 // and answers questions related to which commands are active.
 class ExtensionCommandService : public ProfileKeyedService,
                                 public content::NotificationObserver {
  public:
   // Register prefs for keybinding.
   static void RegisterUserPrefs(PrefService* user_prefs);
 
   // Constructs an ExtensionCommandService object for the given profile.
   explicit ExtensionCommandService(Profile* profile);
   virtual ~ExtensionCommandService();
 
   // Gets the active keybinding (if any) for the browser action of an extension
   // given its |extension_id|. The function consults the master list to see if
   // the keybinding is active. Returns NULL if the extension has no browser
   // action or no active keybinding for it.
-  const Extension::Command* GetActiveBrowserActionCommand(
+  const extensions::Command* GetActiveBrowserActionCommand(
       const std::string& extension_id);
 
   // Gets the active keybinding (if any) for the page action of an extension
   // given its |extension_id|. The function consults the master list to see if
   // the keybinding is active. Returns NULL if the extension has no page action
   // or no active keybinding for it.
-  const Extension::Command* GetActivePageActionCommand(
+  const extensions::Command* GetActivePageActionCommand(
       const std::string& extension_id);
 
   // Gets the active keybinding (if any) for the named commands of an extension
   // given its |extension_id|. The function consults the master list to see if
   // the keybinding is active. Returns an empty map if the extension has no
   // named commands or no active keybinding for the commands.
-  Extension::CommandMap GetActiveNamedCommands(const std::string& extension_id);
+  extensions::CommandMap GetActiveNamedCommands(
+      const std::string& extension_id);
 
   // Checks to see if a keybinding |accelerator| for a given |command_name| in
   // an extension with id |extension_id| is registered as active (by consulting
   // the master list in |user_prefs|).
   bool IsKeybindingActive(const ui::Accelerator& accelerator,
                           std::string extension_id,
                           std::string command_name);
 
   // Records a keybinding |accelerator| as active for an extension with id
   // |extension_id| and command with the name |command_name|. If
@@ skipping 26 matching lines @@
   // The content notification registrar for listening to extension events.
   content::NotificationRegistrar registrar_;
 
   // A weak pointer to the profile we are associated with. Not owned by us.
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionCommandService);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_COMMANDS_EXTENSION_COMMAND_SERVICE_H_