Consolidate ExtensionToolbarModel::Action and LocationBarController::Action

chrome/browser/extensions/location_bar_controller.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_LOCATION_BAR_CONTROLLER_H_
 #define CHROME_BROWSER_EXTENSIONS_LOCATION_BAR_CONTROLLER_H_
 
 #include <vector>
 
 #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"
 
 namespace content {
 class WebContents;
 }
 
-class ExtensionAction;
-
 namespace extensions {
 
 class ActiveScriptController;
 class Extension;
 class ExtensionRegistry;
 class PageActionController;
 
 // Interface for a class that controls the the extension icons that show up in
 // the location bar. Depending on switches, these icons can have differing
 // behavior.
 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.
     virtual ExtensionAction* GetActionForExtension(
         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
     // not in page), so any state relating to the current page should likely be
     // reset.
     virtual void OnNavigated() = 0;
 
     // A notification that the given |extension| has been unloaded, and any
     // actions associated with it should be removed.
     // The location bar controller will update itself after this if needed, so
     // Providers should not call NotifyChange().
     virtual void OnExtensionUnloaded(const Extension* extension) {}
   };
 
   explicit LocationBarController(content::WebContents* web_contents);
   virtual ~LocationBarController();
 
   // Returns the actions which should be displayed in the location bar.
   std::vector<ExtensionAction*> GetCurrentActions();
 
   // 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);
 
   ActiveScriptController* active_script_controller() {
     return active_script_controller_.get();
   }
 
  private:
   // content::WebContentsObserver implementation.
@@ skipping 20 matching lines @@
 
   ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
       extension_registry_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarController);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_LOCATION_BAR_CONTROLLER_H_