DevTools: Decouple AdvancedApp from Toolbox

Source/devtools/front_end/main/AdvancedApp.js

 // 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.
 
 /**
  * @constructor
  * @extends {WebInspector.App}
  */
 WebInspector.AdvancedApp = function()
 {
@@ skipping 36 matching lines @@
     createRootView: function()
     {
         var rootView = new WebInspector.RootView();
 
         this._rootSplitView = new WebInspector.SplitView(false, true, "InspectorView.splitViewState", 300, 300, true);
         this._rootSplitView.show(rootView.element);
 
         WebInspector.inspectorView.show(this._rootSplitView.sidebarElement());
 
         this._inspectedPagePlaceholder = new WebInspector.InspectedPagePlaceholder();
-        this._inspectedPagePlaceholder.addEventListener(WebInspector.InspectedPagePlaceholder.Events.Update, this._onSetInspectedPageBounds.bind(this, false), this);
+        this._inspectedPagePlaceholder.addEventListener(WebInspector.InspectedPagePlaceholder.Events.Update, this.onSetInspectedPageBounds.bind(this, false), this);
         this._responsiveDesignView = new WebInspector.ResponsiveDesignView(this._inspectedPagePlaceholder);
         this._responsiveDesignView.show(this._rootSplitView.mainElement());
 
         WebInspector.dockController.addEventListener(WebInspector.DockController.Events.BeforeDockSideChanged, this._onBeforeDockSideChange, this);
         WebInspector.dockController.addEventListener(WebInspector.DockController.Events.DockSideChanged, this._onDockSideChange, this);
         WebInspector.dockController.addEventListener(WebInspector.DockController.Events.AfterDockSideChanged, this._onAfterDockSideChange, this);
         this._onDockSideChange();
 
         console.timeStamp("AdvancedApp.attachToBody");
         rootView.attachToBody();
@@ skipping 20 matching lines @@
         if (this._toolboxWindow)
             return;
 
         var toolbox = (window.location.search ? "&" : "?") + "toolbox=true";
         var hash = window.location.hash;
         var url = window.location.href.replace(hash, "") + toolbox + hash;
         this._toolboxWindow = window.open(url, undefined);
     },
 
     /**
-     * @param {!WebInspector.Toolbox} toolbox
+     * @param {!WebInspector.ResponsiveDesignView} responsiveDesignView
      */
-    _toolboxLoaded: function(toolbox)
+    toolboxLoaded: function(responsiveDesignView)
     {
-        this._toolbox = toolbox;
+        this._toolboxResponsiveDesignView = responsiveDesignView;
         this._updatePageResizer();
     },
 
     _updatePageResizer: function()
     {
         if (this._isDocked())
             this._responsiveDesignView.updatePageResizer();
-        else if (this._toolbox)
-            this._toolbox._responsiveDesignView.updatePageResizer();
+        else if (this._toolboxResponsiveDesignView)
+            this._toolboxResponsiveDesignView.updatePageResizer();
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _onBeforeDockSideChange: function(event)
     {
-        if (/** @type {string} */ (event.data.to) === WebInspector.DockController.State.Undocked && this._toolbox) {
+        if (/** @type {string} */ (event.data.to) === WebInspector.DockController.State.Undocked && this._toolboxResponsiveDesignView) {
             // Hide inspectorView and force layout to mimic the undocked state.
             this._rootSplitView.hideSidebar();
             this._inspectedPagePlaceholder.update();
         }
 
         this._changingDockSide = true;
     },
 
     /**
      * @param {!WebInspector.Event=} event
      */
     _onDockSideChange: function(event)
     {
         this._updatePageResizer();
 
         var toDockSide = event ? /** @type {string} */ (event.data.to) : WebInspector.dockController.dockSide();
         if (toDockSide === WebInspector.DockController.State.Undocked) {
             this._updateForUndocked();
-        } else if (this._toolbox && event && /** @type {string} */ (event.data.from) === WebInspector.DockController.State.Undocked) {
+        } else if (this._toolboxResponsiveDesignView && event && /** @type {string} */ (event.data.from) === WebInspector.DockController.State.Undocked) {
             // Don't update yet for smooth transition.
             this._rootSplitView.hideSidebar();
         } else {
             this._updateForDocked(toDockSide);
         }
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
@@ skipping 31 matching lines @@
 
     _isDocked: function()
     {
         return WebInspector.dockController.dockSide() !== WebInspector.DockController.State.Undocked;
     },
 
     /**
      * @param {boolean} toolbox
      * @param {!WebInspector.Event} event
      */
-    _onSetInspectedPageBounds: function(toolbox, event)
+    onSetInspectedPageBounds: function(toolbox, event)
     {
         if (this._changingDockSide || (this._isDocked() === toolbox))
             return;
         if (!window.innerWidth || !window.innerHeight)
             return;
         var bounds = /** @type {{x: number, y: number, width: number, height: number}} */ (event.data);
         console.timeStamp("AdvancedApp.setInspectedPageBounds");
         InspectorFrontendHost.setInspectedPageBounds(bounds);
     },
 
@@ skipping 38 matching lines @@
      * @return {?WebInspector.StatusBarItem}
      */
     item: function()
     {
         return this._counter;
     }
 }
 
 /**
  * @constructor
- */
-WebInspector.Toolbox = function()
-{
-    if (!window.opener)
-        return;
-
-    WebInspector.zoomManager = new WebInspector.ZoomManager(window.opener.InspectorFrontendHost);
-    WebInspector.overridesSupport = window.opener.WebInspector.overridesSupport;
-    WebInspector.settings = window.opener.WebInspector.settings;
-    WebInspector.experimentsSettings = window.opener.WebInspector.experimentsSettings;
-    WebInspector.targetManager = window.opener.WebInspector.targetManager;
-    WebInspector.workspace = window.opener.WebInspector.workspace;
-    WebInspector.cssWorkspaceBinding = window.opener.WebInspector.cssWorkspaceBinding;
-    WebInspector.Revealer = window.opener.WebInspector.Revealer;
-    WebInspector.ContextMenu = window.opener.WebInspector.ContextMenu;
-    WebInspector.installPortStyles();
-
-    var advancedApp = /** @type {!WebInspector.AdvancedApp} */ (window.opener.WebInspector.app);
-    var rootView = new WebInspector.RootView();
-    this._inspectedPagePlaceholder = new WebInspector.InspectedPagePlaceholder();
-    this._inspectedPagePlaceholder.addEventListener(WebInspector.InspectedPagePlaceholder.Events.Update, advancedApp._onSetInspectedPageBounds.bind(advancedApp, true));
-    this._responsiveDesignView = new WebInspector.ResponsiveDesignView(this._inspectedPagePlaceholder);
-    this._responsiveDesignView.show(rootView.element);
-    rootView.attachToBody();
-    advancedApp._toolboxLoaded(this);
-}
-
-/**
- * @constructor
  * @implements {WebInspector.StatusBarItem.Provider}
  */
 WebInspector.AdvancedApp.EmulationButtonProvider = function()
 {
 }
 
 WebInspector.AdvancedApp.EmulationButtonProvider.prototype = {
     /**
      * @return {?WebInspector.StatusBarItem}
      */
@@ skipping 20 matching lines @@
     handleAction: function()
     {
         if (!WebInspector.overridesSupport.responsiveDesignAvailable())
             return false;
         if (!(WebInspector.app instanceof WebInspector.AdvancedApp))
             return false;
         WebInspector.app._toggleEmulationEnabled();
         return true;
     }
 }