Consolidate ExtensionAction execution code

chrome/browser/extensions/active_script_controller.cc

 // 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.
 
 #include "chrome/browser/extensions/active_script_controller.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
@@ skipping 121 matching lines @@
   // permissions and granted permissions.
   // TODO(devlin): Make sure that the permission is removed from
   // withheld_permissions if appropriate.
   PermissionsUpdater(web_contents()->GetBrowserContext())
       .AddPermissions(extension, new_permissions.get());
 
   // Allow current tab to run injection.
   OnClicked(extension);
 }
 
+void ActiveScriptController::OnClicked(const Extension* extension) {
+  DCHECK(ContainsKey(pending_requests_, extension->id()));
+  RunPendingForExtension(extension);
+}
+
 bool ActiveScriptController::HasActiveScriptAction(const Extension* extension) {
   return enabled_ && pending_requests_.count(extension->id()) > 0;
 }
 
 ExtensionAction* ActiveScriptController::GetActionForExtension(
     const Extension* extension) {
   if (!enabled_ || pending_requests_.count(extension->id()) == 0)
     return NULL;  // No action for this extension.
 
   ActiveScriptMap::iterator existing =
       active_script_actions_.find(extension->id());
   if (existing != active_script_actions_.end())
     return existing->second.get();
 
   linked_ptr<ExtensionAction> action(ExtensionActionManager::Get(
       Profile::FromBrowserContext(web_contents()->GetBrowserContext()))
       ->GetBestFitAction(*extension, ActionInfo::TYPE_PAGE).release());
   action->SetIsVisible(ExtensionAction::kDefaultTabId, true);
 
   active_script_actions_[extension->id()] = action;
   return action.get();
 }
 
-ExtensionAction::ShowAction ActiveScriptController::OnClicked(
-    const Extension* extension) {
-  DCHECK(ContainsKey(pending_requests_, extension->id()));
-  RunPendingForExtension(extension);
-  return ExtensionAction::ACTION_NONE;
-}
-
 void ActiveScriptController::OnNavigated() {
   LogUMA();
   permitted_extensions_.clear();
   pending_requests_.clear();
 }
 
 void ActiveScriptController::OnExtensionUnloaded(const Extension* extension) {
   PendingRequestMap::iterator iter = pending_requests_.find(extension->id());
   if (iter != pending_requests_.end())
     pending_requests_.erase(iter);
@@ skipping 165 matching lines @@
     UMA_HISTOGRAM_COUNTS_100(
         "Extensions.ActiveScriptController.PermittedExtensions",
         permitted_extensions_.size());
     UMA_HISTOGRAM_COUNTS_100(
         "Extensions.ActiveScriptController.DeniedExtensions",
         pending_requests_.size());
   }
 }
 
 }  // namespace extensions