| Index: Source/devtools/front_end/main/AdvancedApp.js
|
| diff --git a/Source/devtools/front_end/main/AdvancedApp.js b/Source/devtools/front_end/main/AdvancedApp.js
|
| index 97b4c41c73764c46288d2b978292b05ea60d3954..098d2bbaf86c3ee8210643bac5b2f81fa69240ee 100644
|
| --- a/Source/devtools/front_end/main/AdvancedApp.js
|
| +++ b/Source/devtools/front_end/main/AdvancedApp.js
|
| @@ -95,11 +95,13 @@ WebInspector.AdvancedApp.prototype = {
|
| },
|
|
|
| /**
|
| - * @param {!WebInspector.Toolbox} toolbox
|
| + * @param {!WebInspector.ResponsiveDesignView} responsiveDesignView
|
| + * @param {!WebInspector.InspectedPagePlaceholder} placeholder
|
| */
|
| - _toolboxLoaded: function(toolbox)
|
| + toolboxLoaded: function(responsiveDesignView, placeholder)
|
| {
|
| - this._toolbox = toolbox;
|
| + this._toolboxResponsiveDesignView = responsiveDesignView;
|
| + placeholder.addEventListener(WebInspector.InspectedPagePlaceholder.Events.Update, this._onSetInspectedPageBounds.bind(this, true));
|
| this._updatePageResizer();
|
| },
|
|
|
| @@ -107,8 +109,8 @@ WebInspector.AdvancedApp.prototype = {
|
| {
|
| if (this._isDocked())
|
| this._responsiveDesignView.updatePageResizer();
|
| - else if (this._toolbox)
|
| - this._toolbox._responsiveDesignView.updatePageResizer();
|
| + else if (this._toolboxResponsiveDesignView)
|
| + this._toolboxResponsiveDesignView.updatePageResizer();
|
| },
|
|
|
| /**
|
| @@ -116,7 +118,7 @@ WebInspector.AdvancedApp.prototype = {
|
| */
|
| _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();
|
| @@ -135,7 +137,7 @@ WebInspector.AdvancedApp.prototype = {
|
| 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 {
|
| @@ -246,35 +248,6 @@ WebInspector.AdvancedApp.DeviceCounter.prototype = {
|
|
|
| /**
|
| * @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()
|
|
|