Consolidate ExtensionToolbarModel::Action and LocationBarController::Action

chrome/browser/extensions/location_bar_controller.h

Index: chrome/browser/extensions/location_bar_controller.h
diff --git a/chrome/browser/extensions/location_bar_controller.h b/chrome/browser/extensions/location_bar_controller.h
index e1e16451ca50faed94fc1ede3d2b1d0cfdded98d..36c9dd4872338fefe2f1439a37bd0c1443b8fa49 100644
--- a/chrome/browser/extensions/location_bar_controller.h
+++ b/chrome/browser/extensions/location_bar_controller.h
@@ -10,6 +10,7 @@
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/scoped_observer.h"
+#include "chrome/browser/extensions/extension_action.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "extensions/browser/extension_registry_observer.h"
 
@@ -17,8 +18,6 @@ namespace content {
 class WebContents;
 }
 
-class ExtensionAction;
-
 namespace extensions {
 
 class ActiveScriptController;
@@ -32,13 +31,6 @@ class PageActionController;
 class LocationBarController : public content::WebContentsObserver,
                               public ExtensionRegistryObserver {
  public:
-  // The action that the UI should take after executing |OnClicked|.
-  enum Action {
-    ACTION_NONE,
-    ACTION_SHOW_POPUP,
-    ACTION_SHOW_CONTEXT_MENU,
-  };
-
   class ActionProvider {
    public:
     // Returns the action for the given extension, or NULL if there isn't one.
@@ -46,7 +38,7 @@ class LocationBarController : public content::WebContentsObserver,
         const Extension* extension) = 0;
 
     // Handles a click on an extension action.
-    virtual LocationBarController::Action OnClicked(
+    virtual ExtensionAction::ShowAction OnClicked(
         const Extension* extension) = 0;
 
     // A notification that the WebContents has navigated in the main frame (and
@@ -69,7 +61,7 @@ class LocationBarController : public content::WebContentsObserver,
 
   // Notifies this that an ExtensionAction has been clicked, and returns the
   // action which should be taken in response (if any).
-  Action OnClicked(const ExtensionAction* action);
+  ExtensionAction::ShowAction OnClicked(const ExtensionAction* action);
 
   // Notifies the window that the actions have changed.
   static void NotifyChange(content::WebContents* web_contents);