DevTools: Remove editor in drawer experiment

R=pfeldman

Review URL: https://codereview.chromium.org/422313002

git-svn-id: svn://svn.chromium.org/blink/trunk@179154 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/LayoutTests/http/tests/inspector-enabled/open-with-emulation-enabled.html

@@ -5,7 +5,7 @@
 
 function onload()
 {
-    testRunner.showWebInspector(JSON.stringify({lastActivePanel:"\"console\"", emulationEnabled: "true", drawerEditorShown: "false"}));
+    testRunner.showWebInspector(JSON.stringify({lastActivePanel:"\"console\"", emulationEnabled: "true"}));
     runTest();
 }
 

third_party/WebKit/LayoutTests/inspector/extensions/extensions-panel.html

@@ -62,7 +62,6 @@ function initialize_extensionsPanelTest()
         }
         InspectorTest.recordNetwork();
 
-        WebInspector.settings.createSetting("drawerEditorShown", true).set(false);
         InspectorTest.addSniffer(WebInspector.inspectorView.panel("sources"), "showUILocation", showUILocationHook, true);
         InspectorTest.addSniffer(WebInspector.inspectorView.panel("resources"), "showResource", showResourceHook, true);
         InspectorTest.addSniffer(WebInspector.inspectorView.panel("network"), "revealAndHighlightRequest", showRequestHook, true);

third_party/WebKit/Source/devtools/front_end/common/Settings.js

@@ -294,7 +294,6 @@ WebInspector.ExperimentsSettings = function(experimentsEnabled)
     this.devicesPanel = this._createExperiment("devicesPanel", "Devices panel");
     this.disableAgentsWhenProfile = this._createExperiment("disableAgentsWhenProfile", "Disable other agents and UI when profiler is active", true);
     this.dockToLeft = this._createExperiment("dockToLeft", "Dock to left", true);
-    this.editorInDrawer = this._createExperiment("showEditorInDrawer", "Editor in drawer", true);
     this.fileSystemInspection = this._createExperiment("fileSystemInspection", "FileSystem inspection");
     this.frameworksDebuggingSupport = this._createExperiment("frameworksDebuggingSupport", "JavaScript frameworks debugging");
     this.gpuTimeline = this._createExperiment("gpuTimeline", "GPU data on timeline", true);
@@ -597,7 +596,6 @@ WebInspector.VersionController.prototype = {
             "sourcesPanelNavigatorSplitViewState": "sourcesPanelNavigatorSplitViewState",
             "elementsPanelSplitViewState": "elementsPanelSplitViewState",
             "canvasProfileViewReplaySplitViewState": "canvasProfileViewReplaySplitViewState",
-            "editorInDrawerSplitViewState": "editorInDrawerSplitViewState",
             "stylesPaneSplitViewState": "stylesPaneSplitViewState",
             "sourcesPanelDebuggerSidebarSplitViewState": "sourcesPanelDebuggerSidebarSplitViewState"
         };

third_party/WebKit/Source/devtools/front_end/components/Drawer.js

@@ -41,12 +41,6 @@ WebInspector.Drawer = function(splitView)
     splitView.hideDefaultResizer();
     this.show(splitView.sidebarElement());
 
-    this._drawerEditorSplitView = new WebInspector.SplitView(true, true, "editorInDrawerSplitViewState", 0.5, 0.5);
-    this._drawerEditorSplitView.hideSidebar();
-    this._drawerEditorSplitView.addEventListener(WebInspector.SplitView.Events.ShowModeChanged, this._drawerEditorSplitViewShowModeChanged, this);
-    this._drawerEditorShownSetting = WebInspector.settings.createSetting("drawerEditorShown", true);
-    this._drawerEditorSplitView.show(this.element);
-
     this._toggleDrawerButton = new WebInspector.StatusBarButton(WebInspector.UIString("Show drawer."), "console-status-bar-item");
     this._toggleDrawerButton.addEventListener("click", this.toggle, this);
 
@@ -56,14 +50,9 @@ WebInspector.Drawer = function(splitView)
     this._tabbedPane.addEventListener(WebInspector.TabbedPane.EventTypes.TabSelected, this._tabSelected, this);
     new WebInspector.ExtensibleTabbedPaneController(this._tabbedPane, "drawer-view");
 
-    this._toggleDrawerEditorButton = this._drawerEditorSplitView.createShowHideSidebarButton("editor in drawer", "drawer-editor-show-hide-button");
-    this._tabbedPane.element.appendChild(this._toggleDrawerEditorButton.element);
-    if (!WebInspector.experimentsSettings.editorInDrawer.isEnabled())
-        this.setDrawerEditorAvailable(false);
-
     splitView.installResizer(this._tabbedPane.headerElement());
     this._lastSelectedViewSetting = WebInspector.settings.createSetting("WebInspector.Drawer.lastSelectedView", "console");
-    this._tabbedPane.show(this._drawerEditorSplitView.mainElement());
+    this._tabbedPane.show(this.element);
 }
 
 WebInspector.Drawer.prototype = {
@@ -127,7 +116,6 @@ WebInspector.Drawer.prototype = {
         this.showView(this._lastSelectedViewSetting.get());
         this._toggleDrawerButton.toggled = true;
         this._toggleDrawerButton.title = WebInspector.UIString("Hide drawer.");
-        this._ensureDrawerEditorExistsIfNeeded();
     },
 
     willHide: function()
@@ -201,79 +189,9 @@ WebInspector.Drawer.prototype = {
         return this._tabbedPane.selectedTabId;
     },
 
-    /**
-     * @param {!WebInspector.Event} event
-     */
-    _drawerEditorSplitViewShowModeChanged: function(event)
-    {
-        var mode = /** @type {string} */ (event.data);
-        var shown = mode === WebInspector.SplitView.ShowMode.Both;
-
-        if (this._isHidingDrawerEditor)
-            return;
-
-        this._drawerEditorShownSetting.set(shown);
-
-        if (!shown)
-            return;
-
-        this._ensureDrawerEditor();
-        this._drawerEditor.view().show(this._drawerEditorSplitView.sidebarElement());
-    },
-
     initialPanelShown: function()
     {
         this._initialPanelWasShown = true;
-        this._ensureDrawerEditorExistsIfNeeded();
-    },
-
-    _ensureDrawerEditorExistsIfNeeded: function()
-    {
-        if (!this._initialPanelWasShown || !this.isShowing() || !this._drawerEditorShownSetting.get() || !WebInspector.experimentsSettings.editorInDrawer.isEnabled())
-            return;
-        this._ensureDrawerEditor();
-    },
-
-    _ensureDrawerEditor: function()
-    {
-        if (this._drawerEditor)
-            return;
-        this._drawerEditor = WebInspector.moduleManager.instance(WebInspector.DrawerEditor);
-        this._drawerEditor.installedIntoDrawer();
-    },
-
-    /**
-     * @param {boolean} available
-     */
-    setDrawerEditorAvailable: function(available)
-    {
-        if (!WebInspector.experimentsSettings.editorInDrawer.isEnabled())
-            available = false;
-        this._toggleDrawerEditorButton.element.classList.toggle("hidden", !available);
-    },
-
-    showDrawerEditor: function()
-    {
-        if (!WebInspector.experimentsSettings.editorInDrawer.isEnabled())
-            return;
-
-        this._splitView.showBoth();
-        this._drawerEditorSplitView.showBoth();
-    },
-
-    hideDrawerEditor: function()
-    {
-        this._isHidingDrawerEditor = true;
-        this._drawerEditorSplitView.hideSidebar();
-        this._isHidingDrawerEditor = false;
-    },
-
-    /**
-     * @return {boolean}
-     */
-    isDrawerEditorShown: function()
-    {
-        return this._drawerEditorShownSetting.get();
     },
 
     __proto__: WebInspector.VBox.prototype
@@ -315,19 +233,3 @@ WebInspector.Drawer.SingletonViewFactory.prototype = {
         return this._instance;
     }
 }
-
-/**
- * @interface
- */
-WebInspector.DrawerEditor = function()
-{
-}
-
-WebInspector.DrawerEditor.prototype = {
-    /**
-     * @return {!WebInspector.View}
-     */
-    view: function() { },
-
-    installedIntoDrawer: function() { },
-}

third_party/WebKit/Source/devtools/front_end/components/InspectorView.js

@@ -198,32 +198,6 @@ WebInspector.InspectorView.prototype = {
         this._drawer.initialPanelShown();
     },
 
-    showDrawerEditor: function()
-    {
-        this._drawer.showDrawerEditor();
-    },
-
-    /**
-     * @return {boolean}
-     */
-    isDrawerEditorShown: function()
-    {
-        return this._drawer.isDrawerEditorShown();
-    },
-
-    hideDrawerEditor: function()
-    {
-        this._drawer.hideDrawerEditor();
-    },
-
-    /**
-     * @param {boolean} available
-     */
-    setDrawerEditorAvailable: function(available)
-    {
-        this._drawer.setDrawerEditorAvailable(available);
-    },
-
     _tabSelected: function()
     {
         var panelName = this._tabbedPane.selectedTabId;

third_party/WebKit/Source/devtools/front_end/sources/SourcesPanel.js

@@ -67,8 +67,6 @@ WebInspector.SourcesPanel = function(workspaceForTest)
     this.registerRequiredCSS("sourcesPanel.css");
     new WebInspector.UpgradeFileSystemDropTarget(this.element);
 
-    WebInspector.settings.showEditorInDrawer = WebInspector.settings.createSetting("showEditorInDrawer", true);
-
     this._workspace = workspaceForTest || WebInspector.workspace;
 
     this.debugToolbar = this._createDebugToolbar();
@@ -98,13 +96,7 @@ WebInspector.SourcesPanel = function(workspaceForTest)
     this._sourcesView.addEventListener(WebInspector.SourcesView.Events.EditorSelected, this._editorSelected.bind(this));
     this._sourcesView.addEventListener(WebInspector.SourcesView.Events.EditorClosed, this._editorClosed.bind(this));
     this._sourcesView.registerShortcuts(this.registerShortcuts.bind(this));
-
-    if (WebInspector.experimentsSettings.editorInDrawer.isEnabled()) {
-        this._drawerEditorView = new WebInspector.SourcesPanel.DrawerEditorView();
-        this._sourcesView.show(this._drawerEditorView.element);
-    } else {
     this._sourcesView.show(this.editorView.mainElement());
-    }
 
     this._debugSidebarResizeWidgetElement = document.createElementWithClass("div", "resizer-widget");
     this._debugSidebarResizeWidgetElement.id = "scripts-debug-sidebar-resizer-widget";
@@ -197,33 +189,15 @@ WebInspector.SourcesPanel.prototype = {
         return this._paused;
     },
 
-    /**
-     * @return {!WebInspector.SourcesPanel.DrawerEditor}
-     */
-    _drawerEditor: function()
-    {
-        var drawerEditorInstance = WebInspector.moduleManager.instance(WebInspector.DrawerEditor);
-        console.assert(drawerEditorInstance instanceof WebInspector.SourcesPanel.DrawerEditor, "WebInspector.DrawerEditor module instance does not use WebInspector.SourcesPanel.DrawerEditor as an implementation. ");
-        return /** @type {!WebInspector.SourcesPanel.DrawerEditor} */ (drawerEditorInstance);
-    },
-
     wasShown: function()
     {
         WebInspector.context.setFlavor(WebInspector.SourcesPanel, this);
-        if (WebInspector.experimentsSettings.editorInDrawer.isEnabled()) {
-            this._drawerEditor()._panelWasShown();
-            this._sourcesView.show(this.editorView.mainElement());
-        }
         WebInspector.Panel.prototype.wasShown.call(this);
     },
 
     willHide: function()
     {
         WebInspector.Panel.prototype.willHide.call(this);
-        if (WebInspector.experimentsSettings.editorInDrawer.isEnabled()) {
-            this._drawerEditor()._panelWillHide();
-            this._sourcesView.show(this._drawerEditorView.element);
-        }
         WebInspector.context.setFlavor(WebInspector.SourcesPanel, null);
     },
 
@@ -380,10 +354,6 @@ WebInspector.SourcesPanel.prototype = {
     {
         if (this._sourcesView.isShowing())
             return;
-
-        if (this._shouldShowEditorInDrawer() && !forceShowInPanel)
-            this._drawerEditor()._show();
-        else
         WebInspector.inspectorView.showPanel("sources");
     },
 
@@ -396,14 +366,6 @@ WebInspector.SourcesPanel.prototype = {
         this.showUISourceCode(uiLocation.uiSourceCode, uiLocation.lineNumber, uiLocation.columnNumber, forceShowInPanel);
     },
 
-    /**
-     * @return {boolean}
-     */
-    _shouldShowEditorInDrawer: function()
-    {
-        return WebInspector.experimentsSettings.editorInDrawer.isEnabled() && WebInspector.settings.showEditorInDrawer.get() && WebInspector.inspectorView.isDrawerEditorShown();
-    },
-
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      */
@@ -1236,66 +1198,6 @@ WebInspector.UpgradeFileSystemDropTarget.prototype = {
     }
 }
 
-/**
- * @constructor
- * @implements {WebInspector.DrawerEditor}
- */
-WebInspector.SourcesPanel.DrawerEditor = function()
-{
-    this._panel = WebInspector.inspectorView.panel("sources");
-}
-
-WebInspector.SourcesPanel.DrawerEditor.prototype = {
-    /**
-     * @return {!WebInspector.View}
-     */
-    view: function()
-    {
-        return this._panel._drawerEditorView;
-    },
-
-    installedIntoDrawer: function()
-    {
-        if (this._panel.isShowing())
-            this._panelWasShown();
-        else
-            this._panelWillHide();
-    },
-
-    _panelWasShown: function()
-    {
-        WebInspector.inspectorView.setDrawerEditorAvailable(false);
-        WebInspector.inspectorView.hideDrawerEditor();
-    },
-
-    _panelWillHide: function()
-    {
-        WebInspector.inspectorView.setDrawerEditorAvailable(true);
-        if (WebInspector.inspectorView.isDrawerEditorShown())
-            WebInspector.inspectorView.showDrawerEditor();
-    },
-
-    _show: function()
-    {
-        WebInspector.inspectorView.showDrawerEditor();
-    },
-}
-
-/**
- * @constructor
- * @extends {WebInspector.VBox}
- */
-WebInspector.SourcesPanel.DrawerEditorView = function()
-{
-    WebInspector.VBox.call(this);
-    this.element.id = "drawer-editor-view";
-}
-
-WebInspector.SourcesPanel.DrawerEditorView.prototype = {
-    __proto__: WebInspector.VBox.prototype
-}
-
-
 /**
  * @constructor
  * @implements {WebInspector.ContextMenu.Provider}

third_party/WebKit/Source/devtools/front_end/sources/module.json

@@ -50,10 +50,6 @@
                 }
             ]
         },
-        {
-            "type": "@WebInspector.DrawerEditor",
-            "className": "WebInspector.SourcesPanel.DrawerEditor"
-        },
         {
             "type": "@WebInspector.Revealer",
             "contextTypes": ["WebInspector.UILocation"],