Consolidate ExtensionToolbarModel::Action and LocationBarController::Action

chrome/browser/extensions/active_script_controller.h

 // Copyright 2014 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_ACTIVE_SCRIPT_CONTROLLER_H_
 #define CHROME_BROWSER_EXTENSIONS_ACTIVE_SCRIPT_CONTROLLER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 39 matching lines @@
   // active tab permissions. This will run any pending injections for that
   // extension.
   void OnActiveTabPermissionGranted(const Extension* extension);
 
   // Notifies the ActiveScriptController of detected ad injection.
   void OnAdInjectionDetected(const std::set<std::string>& ad_injectors);
 
   // LocationBarControllerProvider implementation.
   virtual ExtensionAction* GetActionForExtension(
       const Extension* extension) OVERRIDE;
-  virtual LocationBarController::Action OnClicked(
+  virtual ExtensionAction::ShowAction OnClicked(
       const Extension* extension) OVERRIDE;
   virtual void OnNavigated() OVERRIDE;
   virtual void OnExtensionUnloaded(const Extension* extension) OVERRIDE;
 
 #if defined(UNIT_TEST)
   // Only used in tests.
   PermissionsData::AccessType RequiresUserConsentForScriptInjectionForTesting(
       const Extension* extension,
       UserScript::InjectionType type) {
     return RequiresUserConsentForScriptInjection(extension, type);
@@ skipping 58 matching lines @@
   // that get generated for extensions that haven't declared anything.
   typedef std::map<std::string, linked_ptr<ExtensionAction> > ActiveScriptMap;
   ActiveScriptMap active_script_actions_;
 
   DISALLOW_COPY_AND_ASSIGN(ActiveScriptController);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_ACTIVE_SCRIPT_CONTROLLER_H_