Commit 83acda0f authored by sergeyv@chromium.org's avatar sergeyv@chromium.org

DevTools: move "Workers in main window" out of experiments

BUG=

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

git-svn-id: svn://svn.chromium.org/blink/trunk@180199 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 69dc5374
...@@ -302,7 +302,6 @@ WebInspector.ExperimentsSettings = function(experimentsEnabled) ...@@ -302,7 +302,6 @@ WebInspector.ExperimentsSettings = function(experimentsEnabled)
this.paintProfiler = this._createExperiment("paintProfiler", "Paint profiler"); this.paintProfiler = this._createExperiment("paintProfiler", "Paint profiler");
this.timelinePowerProfiler = this._createExperiment("timelinePowerProfiler", "Timeline power profiler"); this.timelinePowerProfiler = this._createExperiment("timelinePowerProfiler", "Timeline power profiler");
this.timelineJSCPUProfile = this._createExperiment("timelineJSCPUProfile", "Timeline with JS sampling"); this.timelineJSCPUProfile = this._createExperiment("timelineJSCPUProfile", "Timeline with JS sampling");
this.workersInMainWindow = this._createExperiment("workersInMainWindow", "Workers in main window", true);
this._cleanUpSetting(); this._cleanUpSetting();
} }
......
...@@ -16,8 +16,6 @@ WebInspector.TargetsComboBoxController = function(selectElement, elementToHide) ...@@ -16,8 +16,6 @@ WebInspector.TargetsComboBoxController = function(selectElement, elementToHide)
this._elementToHide = elementToHide; this._elementToHide = elementToHide;
/** @type {!Map.<!WebInspector.Target, !Element>} */ /** @type {!Map.<!WebInspector.Target, !Element>} */
this._targetToOption = new Map(); this._targetToOption = new Map();
if (!WebInspector.experimentsSettings.workersInMainWindow.isEnabled())
return;
WebInspector.context.addFlavorChangeListener(WebInspector.Target, this._targetChangedExternally, this); WebInspector.context.addFlavorChangeListener(WebInspector.Target, this._targetChangedExternally, this);
WebInspector.targetManager.observeTargets(this); WebInspector.targetManager.observeTargets(this);
......
...@@ -53,7 +53,7 @@ WebInspector.WorkerFrontendManager.prototype = { ...@@ -53,7 +53,7 @@ WebInspector.WorkerFrontendManager.prototype = {
{ {
var data = /** @type {{workerId: number, url: string, inspectorConnected: boolean}} */ (event.data); var data = /** @type {{workerId: number, url: string, inspectorConnected: boolean}} */ (event.data);
if (data.inspectorConnected && !WebInspector.experimentsSettings.workersInMainWindow.isEnabled()) if (data.inspectorConnected)
this._openInspectorWindow(data.workerId, true); this._openInspectorWindow(data.workerId, true);
}, },
......
...@@ -326,14 +326,11 @@ WebInspector.Main.prototype = { ...@@ -326,14 +326,11 @@ WebInspector.Main.prototype = {
this._registerShortcuts(); this._registerShortcuts();
if (WebInspector.experimentsSettings.workersInMainWindow.isEnabled()) WebInspector.workerTargetManager = new WebInspector.WorkerTargetManager(mainTarget, WebInspector.targetManager);
WebInspector.workerTargetManager = new WebInspector.WorkerTargetManager(mainTarget, WebInspector.targetManager);
InspectorBackend.registerInspectorDispatcher(this); InspectorBackend.registerInspectorDispatcher(this);
if (!WebInspector.isWorkerFrontend()) if (WebInspector.isWorkerFrontend())
WebInspector.workerFrontendManager = new WebInspector.WorkerFrontendManager();
else
mainTarget.workerManager.addEventListener(WebInspector.WorkerManager.Events.WorkerDisconnected, onWorkerDisconnected); mainTarget.workerManager.addEventListener(WebInspector.WorkerManager.Events.WorkerDisconnected, onWorkerDisconnected);
function onWorkerDisconnected() function onWorkerDisconnected()
......
...@@ -86,9 +86,6 @@ WebInspector.SourcesPanel = function(workspaceForTest) ...@@ -86,9 +86,6 @@ WebInspector.SourcesPanel = function(workspaceForTest)
this.sidebarPanes.xhrBreakpoints = new WebInspector.XHRBreakpointsSidebarPane(); this.sidebarPanes.xhrBreakpoints = new WebInspector.XHRBreakpointsSidebarPane();
this.sidebarPanes.eventListenerBreakpoints = new WebInspector.EventListenerBreakpointsSidebarPane(); this.sidebarPanes.eventListenerBreakpoints = new WebInspector.EventListenerBreakpointsSidebarPane();
if (!WebInspector.isWorkerFrontend() && !WebInspector.experimentsSettings.workersInMainWindow.isEnabled())
this.sidebarPanes.workerList = new WebInspector.WorkersSidebarPane();
this._extensionSidebarPanes = []; this._extensionSidebarPanes = [];
this._installDebuggerSidebarController(); this._installDebuggerSidebarController();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment