Consolidate ExtensionAction execution code

chrome/browser/extensions/location_bar_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/location_bar_controller.h"
 
 #include "base/logging.h"
 #include "chrome/browser/extensions/active_script_controller.h"
 #include "chrome/browser/extensions/page_action_controller.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ skipping 39 matching lines @@
         page_action_controller_->GetActionForExtension(*iter);
     if (!action)
       action = active_script_controller_->GetActionForExtension(*iter);
     if (action)
       current_actions.push_back(action);
   }
 
   return current_actions;
 }
 
-ExtensionAction::ShowAction LocationBarController::OnClicked(
-    const ExtensionAction* action) {
-  const Extension* extension =
-      ExtensionRegistry::Get(web_contents_->GetBrowserContext())
-          ->enabled_extensions().GetByID(action->extension_id());
-  CHECK(extension) << action->extension_id();
-
-  ExtensionAction::ShowAction page_action =
-      page_action_controller_->GetActionForExtension(extension) ?
-          page_action_controller_->OnClicked(extension) :
-          ExtensionAction::ACTION_NONE;
-  ExtensionAction::ShowAction active_script_action =
-      active_script_controller_->GetActionForExtension(extension) ?
-          active_script_controller_->OnClicked(extension) :
-          ExtensionAction::ACTION_NONE;
-
-  // PageAction response takes priority.
-  return page_action != ExtensionAction::ACTION_NONE ? page_action :
-                                                       active_script_action;
-}
-
 // static
 void LocationBarController::NotifyChange(content::WebContents* web_contents) {
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
   if (!browser)
     return;
   LocationBar* location_bar =
       browser->window() ? browser->window()->GetLocationBar() : NULL;
   if (!location_bar)
     return;
   location_bar->UpdatePageActions();
@@ skipping 26 matching lines @@
   if (active_script_controller_->GetActionForExtension(extension)) {
     active_script_controller_->OnExtensionUnloaded(extension);
     should_update = true;
   }
 
   if (should_update)
     NotifyChange(web_contents());
 }
 
 }  // namespace extensions