Consolidate ExtensionToolbarModel::Action and LocationBarController::Action

chrome/browser/extensions/page_action_controller.cc

 // 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.
 
 #include "chrome/browser/extensions/page_action_controller.h"
 
 #include <set>
 
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram.h"
@@ skipping 19 matching lines @@
 }
 
 PageActionController::~PageActionController() {
 }
 
 ExtensionAction* PageActionController::GetActionForExtension(
     const Extension* extension) {
   return ExtensionActionManager::Get(GetProfile())->GetPageAction(*extension);
 }
 
-LocationBarController::Action PageActionController::OnClicked(
+ExtensionAction::ShowAction PageActionController::OnClicked(
     const Extension* extension) {
   ExtensionAction* page_action =
       ExtensionActionManager::Get(GetProfile())->GetPageAction(*extension);
   CHECK(page_action);
 
   int tab_id = SessionID::IdForTab(web_contents_);
   TabHelper::FromWebContents(web_contents_)->
       active_tab_permission_granter()->GrantIfRequested(extension);
 
   if (page_action->HasPopup(tab_id))
-    return LocationBarController::ACTION_SHOW_POPUP;
+    return ExtensionAction::ACTION_SHOW_POPUP;
 
   ExtensionActionAPI::PageActionExecuted(
       web_contents_->GetBrowserContext(),
       *page_action,
       tab_id,
       web_contents_->GetLastCommittedURL().spec(),
       1 /* Button indication. We only ever pass left-click. */);
 
-  return LocationBarController::ACTION_NONE;
+  return ExtensionAction::ACTION_NONE;
 }
 
 void PageActionController::OnNavigated() {
   const ExtensionSet& extensions =
       ExtensionRegistry::Get(web_contents_->GetBrowserContext())
           ->enabled_extensions();
   int tab_id = SessionID::IdForTab(web_contents_);
   size_t num_current_actions = 0u;
   for (ExtensionSet::const_iterator iter = extensions.begin();
        iter != extensions.end();
@@ skipping 16 matching lines @@
   }
 
   LocationBarController::NotifyChange(web_contents_);
 }
 
 Profile* PageActionController::GetProfile() {
   return Profile::FromBrowserContext(web_contents_->GetBrowserContext());
 }
 
 }  // namespace extensions