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

1 files changed, 4 insertions, 4 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();