Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1710)

Unified Diff: Source/devtools/front_end/timeline/TimelinePanel.js

Issue 396803008: Remove some of timeline experiments (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/devtools/front_end/timeline/TimelinePanel.js
diff --git a/Source/devtools/front_end/timeline/TimelinePanel.js b/Source/devtools/front_end/timeline/TimelinePanel.js
index 1965c8865cdfec4b56cf26552468b09352f747c1..243ba31713562c1168f74d3c2551a5c1ca242cb1 100644
--- a/Source/devtools/front_end/timeline/TimelinePanel.js
+++ b/Source/devtools/front_end/timeline/TimelinePanel.js
@@ -75,8 +75,7 @@ WebInspector.TimelinePanel = function()
this._windowEndTime = Infinity;
// Create model.
- if (WebInspector.experimentsSettings.timelineTracingMode.isEnabled() ||
- WebInspector.experimentsSettings.timelineOnTraceEvents.isEnabled()) {
+ if (WebInspector.experimentsSettings.timelineOnTraceEvents.isEnabled()) {
this._tracingModel = new WebInspector.TracingModel(WebInspector.targetManager.activeTarget());
this._tracingModel.addEventListener(WebInspector.TracingModel.Events.BufferUsage, this._onTracingBufferUsage, this);
@@ -365,13 +364,7 @@ WebInspector.TimelinePanel.prototype = {
this._capturePowerSetting.addChangeListener(this._onModeChanged, this);
}
- if (WebInspector.experimentsSettings.timelineTracingMode.isEnabled()) {
- this._captureTracingSetting = WebInspector.settings.createSetting("timelineCaptureTracing", false);
- topPaneSidebarElement.appendChild(this._createSettingCheckbox(WebInspector.UIString("Capture tracing"),
- this._captureTracingSetting,
- WebInspector.UIString("Capture tracing information")));
- this._captureTracingSetting.addChangeListener(this._onModeChanged, this);
- } else if (WebInspector.experimentsSettings.timelineOnTraceEvents.isEnabled()) {
+ if (WebInspector.experimentsSettings.timelineOnTraceEvents.isEnabled()) {
this._captureLayersAndPicturesSetting = WebInspector.settings.createSetting("timelineCaptureLayersAndPictures", false);
topPaneSidebarElement.appendChild(this._createSettingCheckbox(WebInspector.UIString("Capture pictures"),
this._captureLayersAndPicturesSetting,
@@ -409,7 +402,7 @@ WebInspector.TimelinePanel.prototype = {
this._statusBarButtons.push(framesToggleButton);
panelStatusBarElement.appendChild(framesToggleButton.element);
- if (WebInspector.experimentsSettings.timelineFlameChart.isEnabled()) {
+ if (WebInspector.experimentsSettings.timelineOnTraceEvents.isEnabled()) {
var flameChartToggleButton = new WebInspector.StatusBarButton(WebInspector.UIString("Tracing mode"), "timeline-flame-chart-status-bar-item");
flameChartToggleButton.toggled = this._flameChartEnabledSetting.get();
flameChartToggleButton.addEventListener("click", this._flameChartEnabledChanged.bind(this, flameChartToggleButton));
@@ -651,7 +644,7 @@ WebInspector.TimelinePanel.prototype = {
else
this._overviewControls.push(new WebInspector.TimelineEventOverview(this._model, this._uiUtils));
- if (WebInspector.experimentsSettings.timelineFlameChart.isEnabled() && this._flameChartEnabledSetting.get()) {
+ if (WebInspector.experimentsSettings.timelineOnTraceEvents.isEnabled() && this._flameChartEnabledSetting.get()) {
var tracingTimelineModel = WebInspector.experimentsSettings.timelineOnTraceEvents.isEnabled() ? this._tracingTimelineModel : null;
this._addModeView(new WebInspector.TimelineFlameChart(this, this._model, tracingTimelineModel, this._frameModel(), this._uiUtils));
} else {
« no previous file with comments | « Source/devtools/front_end/common/Settings.js ('k') | Source/devtools/front_end/timeline/TracingTimelineModel.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698