Uncouple ActiveScriptController from LocationBarController

chrome/browser/extensions/tab_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_
 #define CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 20 matching lines @@
 namespace content {
 struct LoadCommittedDetails;
 class RenderFrameHost;
 }
 
 namespace gfx {
 class Image;
 }
 
 namespace extensions {
+class ActiveScriptController;
 class BookmarkAppHelper;
 class Extension;
 class LocationBarController;
 class WebstoreInlineInstallerFactory;
 
 // Per-tab extension helper. Also handles non-extension apps.
 class TabHelper : public content::WebContentsObserver,
                   public extensions::ExtensionFunctionDispatcher::Delegate,
                   public base::SupportsWeakPtr<TabHelper>,
                   public content::NotificationObserver,
@@ skipping 51 matching lines @@
   }
 
   ScriptExecutor* script_executor() {
     return script_executor_.get();
   }
 
   LocationBarController* location_bar_controller() {
     return location_bar_controller_.get();
   }
 
+  ActiveScriptController* active_script_controller() {
+    return active_script_controller_.get();
+  }
+
   ActiveTabPermissionGranter* active_tab_permission_granter() {
     return active_tab_permission_granter_.get();
   }
 
   // Sets a non-extension app icon associated with WebContents and fires an
   // INVALIDATE_TYPE_TITLE navigation state change to trigger repaint of title.
   void SetAppIcon(const SkBitmap& app_icon);
 
   // Sets the factory used to create inline webstore item installers.
   // Used for testing. Takes ownership of the factory instance.
@@ skipping 116 matching lines @@
 
   // Whether to trigger an update when the page load completes.
   bool update_shortcut_on_load_complete_;
 
   content::NotificationRegistrar registrar_;
 
   scoped_ptr<ScriptExecutor> script_executor_;
 
   scoped_ptr<LocationBarController> location_bar_controller_;
 
+  scoped_ptr<ActiveScriptController> active_script_controller_;
+
   scoped_ptr<ActiveTabPermissionGranter> active_tab_permission_granter_;
 
   scoped_ptr<BookmarkAppHelper> bookmark_app_helper_;
 
   Profile* profile_;
 
   // Vend weak pointers that can be invalidated to stop in-progress loads.
   base::WeakPtrFactory<TabHelper> image_loader_ptr_factory_;
 
   // Creates WebstoreInlineInstaller instances for inline install triggers.
   scoped_ptr<WebstoreInlineInstallerFactory> webstore_inline_installer_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TabHelper);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_