Uncouple ActiveScriptController from LocationBarController

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"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/active_tab_permission_granter.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_util.h"
-#include "chrome/browser/extensions/location_bar_controller.h"
 #include "chrome/browser/extensions/permissions_updater.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "components/crx_file/id_util.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_view_host.h"
@@ skipping 43 matching lines @@
 ActiveScriptController::~ActiveScriptController() {
   LogUMA();
 }
 
 // static
 ActiveScriptController* ActiveScriptController::GetForWebContents(
     content::WebContents* web_contents) {
   if (!web_contents)
     return NULL;
   TabHelper* tab_helper = TabHelper::FromWebContents(web_contents);
-  if (!tab_helper)
-    return NULL;
-  LocationBarController* location_bar_controller =
-      tab_helper->location_bar_controller();
-  // This should never be NULL.
-  DCHECK(location_bar_controller);
-  return location_bar_controller->active_script_controller();
+  return tab_helper ? tab_helper->active_script_controller() : NULL;
 }
 
 void ActiveScriptController::OnActiveTabPermissionGranted(
     const Extension* extension) {
   RunPendingForExtension(extension);
 }
 
 void ActiveScriptController::OnAdInjectionDetected(
     const std::set<std::string>& ad_injectors) {
   // We're only interested in data if there are ad injectors detected.
@@ skipping 44 matching lines @@
 
   // 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) {
+bool ActiveScriptController::WantsToRun(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();
-}
-
 PermissionsData::AccessType
 ActiveScriptController::RequiresUserConsentForScriptInjection(
     const Extension* extension,
     UserScript::InjectionType type) {
   CHECK(extension);
 
   // If the feature is not enabled, we automatically allow all extensions to
   // run scripts.
   if (!enabled_)
     permitted_extensions_.insert(extension->id());
@@ skipping 179 matching lines @@
     UnloadedExtensionInfo::Reason reason) {
   PendingRequestMap::iterator iter = pending_requests_.find(extension->id());
   if (iter != pending_requests_.end()) {
     pending_requests_.erase(iter);
     ExtensionActionAPI::Get(web_contents()->GetBrowserContext())->
         NotifyPageActionsChanged(web_contents());
   }
 }
 
 }  // namespace extensions