Commit 4804531b authored by pfeldman@chromium.org's avatar pfeldman@chromium.org

DevTools: remove eye dropper from behind experiment.

BUG=404375
R=vsevik@chromium.org

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

git-svn-id: svn://svn.chromium.org/blink/trunk@180468 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent ef20e5b9
...@@ -291,7 +291,6 @@ WebInspector.ExperimentsSettings = function(experimentsEnabled) ...@@ -291,7 +291,6 @@ WebInspector.ExperimentsSettings = function(experimentsEnabled)
// Add currently running experiments here. // Add currently running experiments here.
this.applyCustomStylesheet = this._createExperiment("applyCustomStylesheet", "Allow custom UI themes"); this.applyCustomStylesheet = this._createExperiment("applyCustomStylesheet", "Allow custom UI themes");
this.canvasInspection = this._createExperiment("canvasInspection ", "Canvas inspection"); this.canvasInspection = this._createExperiment("canvasInspection ", "Canvas inspection");
this.colorPicker = this._createExperiment("colorPicker", "Color picker", true);
this.devicesPanel = this._createExperiment("devicesPanel", "Devices panel"); this.devicesPanel = this._createExperiment("devicesPanel", "Devices panel");
this.disableAgentsWhenProfile = this._createExperiment("disableAgentsWhenProfile", "Disable other agents and UI when profiler is active", true); 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.dockToLeft = this._createExperiment("dockToLeft", "Dock to left", true);
......
...@@ -374,10 +374,9 @@ WebInspector.SpectrumPopupHelper.prototype = { ...@@ -374,10 +374,9 @@ WebInspector.SpectrumPopupHelper.prototype = {
document.addEventListener("mousedown", this._hideProxy, false); document.addEventListener("mousedown", this._hideProxy, false);
window.addEventListener("resize", this._hideProxy, false); window.addEventListener("resize", this._hideProxy, false);
if (WebInspector.experimentsSettings.colorPicker.isEnabled()) {
WebInspector.targetManager.addModelListener(WebInspector.ResourceTreeModel, WebInspector.ResourceTreeModel.EventTypes.ColorPicked, this._colorPicked, this); WebInspector.targetManager.addModelListener(WebInspector.ResourceTreeModel, WebInspector.ResourceTreeModel.EventTypes.ColorPicked, this._colorPicked, this);
PageAgent.setColorPickerEnabled(true); PageAgent.setColorPickerEnabled(true);
}
return true; return true;
}, },
...@@ -402,10 +401,8 @@ WebInspector.SpectrumPopupHelper.prototype = { ...@@ -402,10 +401,8 @@ WebInspector.SpectrumPopupHelper.prototype = {
document.removeEventListener("mousedown", this._hideProxy, false); document.removeEventListener("mousedown", this._hideProxy, false);
window.removeEventListener("resize", this._hideProxy, false); window.removeEventListener("resize", this._hideProxy, false);
if (WebInspector.experimentsSettings.colorPicker.isEnabled()) { PageAgent.setColorPickerEnabled(false);
PageAgent.setColorPickerEnabled(false); WebInspector.targetManager.removeModelListener(WebInspector.ResourceTreeModel, WebInspector.ResourceTreeModel.EventTypes.ColorPicked, this._colorPicked, this);
WebInspector.targetManager.removeModelListener(WebInspector.ResourceTreeModel, WebInspector.ResourceTreeModel.EventTypes.ColorPicked, this._colorPicked, this);
}
this.dispatchEventToListeners(WebInspector.SpectrumPopupHelper.Events.Hidden, !!commitEdit); this.dispatchEventToListeners(WebInspector.SpectrumPopupHelper.Events.Hidden, !!commitEdit);
......
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