commit ba69a7db718bd6815e154b36cead5d0e25d9e45e
author finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Sep 28 21:09:56 2009
committer finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Sep 28 21:09:56 2009
tree 57a415ee022130e50bd27e8346fc02f6d2a238cc
parent d55aaa139da94452ebd6812bfa9241ba050978d9

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

chrome/browser/tab_contents/tab_contents.cc

diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index d36d53fb..fab3ccc 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -51,8 +51,8 @@
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/common/page_action.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/render_messages.h"
@@ -586,7 +586,7 @@
   NotifyNavigationStateChanged(INVALIDATE_TAB);
 }
 
-void TabContents::SetPageActionEnabled(const ContextualAction* page_action,
+void TabContents::SetPageActionEnabled(const ExtensionAction* page_action,
                                        bool enable,
                                        const std::string& title,
                                        int icon_id) {
@@ -599,14 +599,14 @@
 
   if (enable) {
     enabled_page_actions_[page_action].reset(
-        new ContextualActionState(title, icon_id));
+        new ExtensionActionState(title, icon_id));
   } else {
     enabled_page_actions_.erase(page_action);
   }
 }
 
-const ContextualActionState* TabContents::GetPageActionState(
-    const ContextualAction* page_action) {
+const ExtensionActionState* TabContents::GetPageActionState(
+    const ExtensionAction* page_action) {
   if (enabled_page_actions_.end() == enabled_page_actions_.find(page_action))
     return NULL;