Moving ContextualAction class to common/extensions and in the process renaming it ExtensionAction.

No code change.

BUG=None
TEST=Page actions and browser actions should work as before (no change)

Review URL: http://codereview.chromium.org/242035

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27406 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 23 insertions, 23 deletions

diff --git a/chrome/browser/extensions/extension_file_util.cc b/chrome/browser/extensions/extension_file_util.cc
index 5c49e05..28a7482 100644
--- a/chrome/browser/extensions/extension_file_util.cc
+++ b/chrome/browser/extensions/extension_file_util.cc
@@ -212,10 +212,10 @@ bool ValidateExtension(Extension* extension, std::string* error) {
   }
 
   // Validate icon location for page actions.
-  const ContextualActionMap& page_actions = extension->page_actions();
-  for (ContextualActionMap::const_iterator i(page_actions.begin());
+  const ExtensionActionMap& page_actions = extension->page_actions();
+  for (ExtensionActionMap::const_iterator i(page_actions.begin());
        i != page_actions.end(); ++i) {
-    ContextualAction* page_action = i->second;
+    ExtensionAction* page_action = i->second;
     const std::vector<std::string>& icon_paths = page_action->icon_paths();
     for (std::vector<std::string>::const_iterator iter = icon_paths.begin();
          iter != icon_paths.end(); ++iter) {
@@ -228,7 +228,7 @@ bool ValidateExtension(Extension* extension, std::string* error) {
   }
 
   // Validate icon location for browser actions.
-  const ContextualAction* browser_action = extension->browser_action();
+  const ExtensionAction* browser_action = extension->browser_action();
   if (browser_action) {
     const std::vector<std::string>& icon_paths = browser_action->icon_paths();
     for (std::vector<std::string>::const_iterator iter = icon_paths.begin();
diff --git a/chrome/browser/extensions/extension_page_actions_module.cc b/chrome/browser/extensions/extension_page_actions_module.cc
index 2e9f64d..82fa1c4 100644
--- a/chrome/browser/extensions/extension_page_actions_module.cc
+++ b/chrome/browser/extensions/extension_page_actions_module.cc
@@ -70,9 +70,9 @@ bool PageActionFunction::SetPageActionEnabled(bool enable) {
     return false;
   }
 
-  const ContextualAction* page_action =
-      extension->GetContextualAction(page_action_id,
-                                     ContextualAction::PAGE_ACTION);
+  const ExtensionAction* page_action =
+      extension->GetExtensionAction(page_action_id,
+                                    ExtensionAction::PAGE_ACTION);
   if (!page_action) {
     error_ = ExtensionErrorUtils::FormatErrorMessage(keys::kNoPageActionError,
                                                      page_action_id);
diff --git a/chrome/browser/extensions/extension_process_manager.cc b/chrome/browser/extensions/extension_process_manager.cc
index d241360..96e7a25 100644
--- a/chrome/browser/extensions/extension_process_manager.cc
+++ b/chrome/browser/extensions/extension_process_manager.cc
@@ -107,7 +107,7 @@ void ExtensionProcessManager::RegisterExtensionProcess(
 
   std::vector<std::string> page_action_ids;
   Extension* extension = extension_service->GetExtensionById(extension_id);
-  for (ContextualActionMap::const_iterator i =
+  for (ExtensionActionMap::const_iterator i =
            extension->page_actions().begin();
        i != extension->page_actions().end(); ++i) {
     page_action_ids.push_back(i->first);
diff --git a/chrome/browser/extensions/extensions_service.cc b/chrome/browser/extensions/extensions_service.cc
index 04ddba2..1258e849 100644
--- a/chrome/browser/extensions/extensions_service.cc
+++ b/chrome/browser/extensions/extensions_service.cc
@@ -144,12 +144,12 @@ void ExtensionsService::Init() {
   GarbageCollectExtensions();
 }
 
-std::vector<ContextualAction*> ExtensionsService::GetPageActions() const {
-  return GetContextualActions(ContextualAction::PAGE_ACTION);
+std::vector<ExtensionAction*> ExtensionsService::GetPageActions() const {
+  return GetExtensionActions(ExtensionAction::PAGE_ACTION);
 }
 
-std::vector<ContextualAction*> ExtensionsService::GetBrowserActions() const {
-  return GetContextualActions(ContextualAction::BROWSER_ACTION);
+std::vector<ExtensionAction*> ExtensionsService::GetBrowserActions() const {
+  return GetExtensionActions(ExtensionAction::BROWSER_ACTION);
 }
 
 void ExtensionsService::InstallExtension(const FilePath& extension_path) {
@@ -324,21 +324,21 @@ void ExtensionsService::LoadInstalledExtension(
   }
 }
 
-std::vector<ContextualAction*> ExtensionsService::GetContextualActions(
-    ContextualAction::ContextualActionType action_type) const {
-  std::vector<ContextualAction*> result;
+std::vector<ExtensionAction*> ExtensionsService::GetExtensionActions(
+    ExtensionAction::ExtensionActionType action_type) const {
+  std::vector<ExtensionAction*> result;
 
   // TODO(finnur): Sort the icons in some meaningful way.
   for (ExtensionList::const_iterator iter = extensions_.begin();
        iter != extensions_.end(); ++iter) {
-    if (action_type == ContextualAction::PAGE_ACTION) {
-      const ContextualActionMap* page_actions = &(*iter)->page_actions();
-      for (ContextualActionMap::const_iterator i(page_actions->begin());
+    if (action_type == ExtensionAction::PAGE_ACTION) {
+      const ExtensionActionMap* page_actions = &(*iter)->page_actions();
+      for (ExtensionActionMap::const_iterator i(page_actions->begin());
            i != page_actions->end(); ++i) {
         result.push_back(i->second);
       }
     } else {
-      ContextualAction* browser_action = (*iter)->browser_action();
+      ExtensionAction* browser_action = (*iter)->browser_action();
       if (browser_action)
         result.push_back(browser_action);
     }
diff --git a/chrome/browser/extensions/extensions_service.h b/chrome/browser/extensions/extensions_service.h
index 12f3416..d683585 100644
--- a/chrome/browser/extensions/extensions_service.h
+++ b/chrome/browser/extensions/extensions_service.h
@@ -104,11 +104,11 @@ class ExtensionsService
 
   // Retrieves a vector of all page actions, irrespective of which extension
   // they belong to.
-  std::vector<ContextualAction*> GetPageActions() const;
+  std::vector<ExtensionAction*> GetPageActions() const;
 
   // Retrieves a vector of all browser actions, irrespective of which extension
   // they belong to.
-  std::vector<ContextualAction*> GetBrowserActions() const;
+  std::vector<ExtensionAction*> GetBrowserActions() const;
 
   // Install the extension file at |extension_path|.  Will install as an
   // update if an older version is already installed.
@@ -238,8 +238,8 @@ class ExtensionsService
 
   // Retrieves a vector of all page actions or browser actions, irrespective of
   // which extension they belong to.
-  std::vector<ContextualAction*> GetContextualActions(
-      ContextualAction::ContextualActionType action_type) const;
+  std::vector<ExtensionAction*> GetExtensionActions(
+      ExtensionAction::ExtensionActionType action_type) const;
 
   // The profile this ExtensionsService is part of.
   Profile* profile_;