Uncouple ActiveScriptController from LocationBarController

chrome/browser/extensions/extension_context_menu_model.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/extension_context_menu_model.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/extensions/active_script_controller.h"
@@ skipping 265 matching lines @@
   AppendExtensionItems();
   AddSeparator(ui::NORMAL_SEPARATOR);
 
   // Add the "Always Allow" item for adding persisted permissions for script
   // injections if there is an active action for this extension. Note that this
   // will add it to *all* extension action context menus, not just the one
   // attached to the script injection request icon, but that's okay.
   WebContents* web_contents = GetActiveWebContents();
   if (web_contents &&
       extensions::ActiveScriptController::GetForWebContents(web_contents)
-          ->HasActiveScriptAction(extension)) {
+          ->WantsToRun(extension)) {
     AddItemWithStringId(ALWAYS_RUN, IDS_EXTENSIONS_ALWAYS_RUN);
   }
 
   AddItemWithStringId(CONFIGURE, IDS_EXTENSIONS_OPTIONS_MENU_ITEM);
   AddItem(UNINSTALL, l10n_util::GetStringUTF16(IDS_EXTENSIONS_UNINSTALL));
 
   // Add a toggle visibility (show/hide) if the extension icon is shown on the
   // toolbar.
   int visibility_string_id = GetVisibilityStringId(profile_, extension);
   if (visibility_string_id != -1)
@@ skipping 22 matching lines @@
   extension_items_count_ = 0;
   extension_items_->AppendExtensionItems(MenuItem::ExtensionKey(extension_id_),
                                          base::string16(),
                                          &extension_items_count_,
                                          true);  // is_action_menu
 }
 
 content::WebContents* ExtensionContextMenuModel::GetActiveWebContents() const {
   return browser_->tab_strip_model()->GetActiveWebContents();
 }