Chromium Code Reviews| 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 9afcaa8c0dc5957b881c1e55dbd990f4d6461351..3b62eea783dba7f20498c5dc51e34279a24c7921 100644 |
| --- a/Source/devtools/front_end/timeline/TimelinePanel.js |
| +++ b/Source/devtools/front_end/timeline/TimelinePanel.js |
| @@ -47,18 +47,12 @@ WebInspector.TimelinePanel = function() |
| this._windowStartTime = 0; |
| this._windowEndTime = Infinity; |
| - // Create model. |
| - if (WebInspector.experimentsSettings.timelineOnTraceEvents.isEnabled()) { |
| - this._tracingModel = new WebInspector.TracingModel(); |
| - this._tracingModel.addEventListener(WebInspector.TracingModel.Events.BufferUsage, this._onTracingBufferUsage, this); |
| - |
| - this._uiUtils = new WebInspector.TracingTimelineUIUtils(); |
| - this._tracingTimelineModel = new WebInspector.TracingTimelineModel(this._tracingModel, this._uiUtils.hiddenRecordsFilter()); |
| - this._model = this._tracingTimelineModel; |
| - } else { |
| - this._uiUtils = new WebInspector.TimelineUIUtilsImpl(); |
| - this._model = new WebInspector.TimelineModelImpl(); |
|
alph
2014/08/21 13:13:40
Are there two classes still used?
yurys
2014/08/21 14:18:42
No. I'm going to remove them in one of the followi
|
| - } |
| + this._tracingModel = new WebInspector.TracingModel(); |
| + this._tracingModel.addEventListener(WebInspector.TracingModel.Events.BufferUsage, this._onTracingBufferUsage, this); |
| + |
| + this._uiUtils = new WebInspector.TracingTimelineUIUtils(); |
| + this._tracingTimelineModel = new WebInspector.TracingTimelineModel(this._tracingModel, this._uiUtils.hiddenRecordsFilter()); |
| + this._model = this._tracingTimelineModel; |
| this._model.addEventListener(WebInspector.TimelineModel.Events.RecordingStarted, this._onRecordingStarted, this); |
| this._model.addEventListener(WebInspector.TimelineModel.Events.RecordingStopped, this._onRecordingStopped, this); |
| @@ -338,13 +332,11 @@ WebInspector.TimelinePanel.prototype = { |
| this._statusBarButtons.push(framesToggleButton); |
| panelStatusBarElement.appendChild(framesToggleButton.element); |
| - 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)); |
| - this._statusBarButtons.push(flameChartToggleButton); |
| - panelStatusBarElement.appendChild(flameChartToggleButton.element); |
| - } |
| + 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)); |
| + this._statusBarButtons.push(flameChartToggleButton); |
| + panelStatusBarElement.appendChild(flameChartToggleButton.element); |
| this._captureStacksSetting = WebInspector.settings.createSetting("timelineCaptureStacks", true); |
| panelStatusBarElement.appendChild(this._createSettingCheckbox(WebInspector.UIString("Stacks"), |
| @@ -363,8 +355,7 @@ WebInspector.TimelinePanel.prototype = { |
| WebInspector.UIString("Capture power information"))); |
| this._capturePowerSetting.addChangeListener(this._onModeChanged, this); |
| } |
| - if (WebInspector.experimentsSettings.timelineOnTraceEvents.isEnabled() && |
| - WebInspector.experimentsSettings.paintProfiler.isEnabled()) { |
| + if (WebInspector.experimentsSettings.paintProfiler.isEnabled()) { |
| this._captureLayersAndPicturesSetting = WebInspector.settings.createSetting("timelineCaptureLayersAndPictures", false); |
| panelStatusBarElement.appendChild(this._createSettingCheckbox(WebInspector.UIString("Paint"), |
| this._captureLayersAndPicturesSetting, |
| @@ -377,11 +368,6 @@ WebInspector.TimelinePanel.prototype = { |
| this._filtersContainer.appendChild(this._filterBar.filtersElement()); |
| this._filterBar.addEventListener(WebInspector.FilterBar.Events.FiltersToggled, this._onFiltersToggled, this); |
| this._filterBar.setName("timelinePanel"); |
| - if (!WebInspector.experimentsSettings.timelineOnTraceEvents.isEnabled()) { |
| - var targetsComboBox = new WebInspector.StatusBarComboBox(null); |
| - panelStatusBarElement.appendChild(targetsComboBox.element); |
| - new WebInspector.TargetsComboBoxController(targetsComboBox.selectElement(), targetsComboBox.element); |
| - } |
| }, |
| /** |