Chromium Code Reviews| Index: Source/devtools/front_end/main/Main.js |
| diff --git a/Source/devtools/front_end/main/Main.js b/Source/devtools/front_end/main/Main.js |
| index d542efe63003b85da39fdb39afc7f69957897275..9c88d13ff653d2cef53f3add261f3d23ac3bd276 100644 |
| --- a/Source/devtools/front_end/main/Main.js |
| +++ b/Source/devtools/front_end/main/Main.js |
| @@ -44,7 +44,9 @@ WebInspector.Main = function() |
| this._loaded(); |
| window.removeEventListener("DOMContentLoaded", boundListener, false); |
| } |
| - window.addEventListener("DOMContentLoaded", boundListener, false); |
| + |
| + if (!WebInspector.queryParam("toolbox")) |
| + window.addEventListener("DOMContentLoaded", boundListener, false); |
| } |
| WebInspector.Main.prototype = { |
| @@ -79,42 +81,10 @@ WebInspector.Main.prototype = { |
| _createRootView: function() |
| { |
| var rootView = new WebInspector.RootView(); |
| - |
| - this._rootSplitView = new WebInspector.SplitView(false, true, WebInspector.dockController.canDock() ? "InspectorView.splitViewState" : "InspectorView.dummySplitViewState", 300, 300); |
| - this._rootSplitView.show(rootView.element); |
| - |
| - WebInspector.inspectorView.show(this._rootSplitView.sidebarElement()); |
| - |
| - var inspectedPagePlaceholder = new WebInspector.InspectedPagePlaceholder(); |
| - if (WebInspector.dockController.canDock() && WebInspector.experimentsSettings.responsiveDesign.isEnabled()) { |
| - var responsiveDesignView = new WebInspector.ResponsiveDesignView(inspectedPagePlaceholder); |
| - responsiveDesignView.show(this._rootSplitView.mainElement()); |
| - } else |
| - inspectedPagePlaceholder.show(this._rootSplitView.mainElement()); |
| - |
| - WebInspector.dockController.addEventListener(WebInspector.DockController.Events.DockSideChanged, this._updateRootSplitViewOnDockSideChange, this); |
| - this._updateRootSplitViewOnDockSideChange(); |
| - |
| + WebInspector.inspectorView.show(rootView.element); |
| rootView.attachToBody(); |
| }, |
| - _updateRootSplitViewOnDockSideChange: function() |
|
pfeldman
2014/05/27 15:37:04
Where did this code go?
|
| - { |
| - var dockSide = WebInspector.dockController.dockSide(); |
| - if (dockSide === WebInspector.DockController.State.Undocked) { |
| - this._rootSplitView.toggleResizer(this._rootSplitView.resizerElement(), false); |
| - this._rootSplitView.toggleResizer(WebInspector.inspectorView.topResizerElement(), false); |
| - this._rootSplitView.hideMain(); |
| - return; |
| - } |
| - |
| - this._rootSplitView.setVertical(dockSide === WebInspector.DockController.State.DockedToLeft || dockSide === WebInspector.DockController.State.DockedToRight); |
| - this._rootSplitView.setSecondIsSidebar(dockSide === WebInspector.DockController.State.DockedToRight || dockSide === WebInspector.DockController.State.DockedToBottom); |
| - this._rootSplitView.toggleResizer(this._rootSplitView.resizerElement(), true); |
| - this._rootSplitView.toggleResizer(WebInspector.inspectorView.topResizerElement(), dockSide === WebInspector.DockController.State.DockedToBottom); |
| - this._rootSplitView.showBoth(); |
| - }, |
| - |
| _calculateWorkerInspectorTitle: function() |
| { |
| var expression = "location.href"; |
| @@ -358,6 +328,8 @@ WebInspector.Main.prototype = { |
| // Screencast controller creates a root view itself. |
| if (mainTarget.canScreencast) |
| this._screencastController = new WebInspector.ScreencastController(); |
| + else if (WebInspector.dockController.canDock()) |
| + this._toolbox = new WebInspector.Toolbox(); |
| else |
| this._createRootView(); |
| this._createGlobalStatusBarItems(); |