OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
3 * Copyright (C) 2012 Intel Inc. All rights reserved. | 3 * Copyright (C) 2012 Intel Inc. All rights reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
7 * met: | 7 * met: |
8 * | 8 * |
9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
229 this._createSettingCheckbox(this._showScreenshotsSetting, Common.UIStrin
g('Capture screenshots')); | 229 this._createSettingCheckbox(this._showScreenshotsSetting, Common.UIStrin
g('Capture screenshots')); |
230 this._panelToolbar.appendToolbarItem(this._showScreenshotsToolbarCheckbox); | 230 this._panelToolbar.appendToolbarItem(this._showScreenshotsToolbarCheckbox); |
231 | 231 |
232 this._showMemoryToolbarCheckbox = | 232 this._showMemoryToolbarCheckbox = |
233 this._createSettingCheckbox(this._showMemorySetting, Common.UIString('Sh
ow memory timeline')); | 233 this._createSettingCheckbox(this._showMemorySetting, Common.UIString('Sh
ow memory timeline')); |
234 this._panelToolbar.appendToolbarItem(this._showMemoryToolbarCheckbox); | 234 this._panelToolbar.appendToolbarItem(this._showMemoryToolbarCheckbox); |
235 | 235 |
236 // GC | 236 // GC |
237 this._panelToolbar.appendToolbarItem(UI.Toolbar.createActionButtonForId('com
ponents.collect-garbage')); | 237 this._panelToolbar.appendToolbarItem(UI.Toolbar.createActionButtonForId('com
ponents.collect-garbage')); |
238 | 238 |
| 239 this._currentView.populateToolbar(this._panelToolbar); |
| 240 |
239 // Settings | 241 // Settings |
240 this._panelToolbar.appendSpacer(); | 242 this._panelToolbar.appendSpacer(); |
241 this._panelToolbar.appendText(''); | 243 this._panelToolbar.appendText(''); |
242 this._panelToolbar.appendSeparator(); | 244 this._panelToolbar.appendSeparator(); |
243 this._panelToolbar.appendToolbarItem(this._showSettingsPaneButton); | 245 this._panelToolbar.appendToolbarItem(this._showSettingsPaneButton); |
244 } | 246 } |
245 | 247 |
246 _createSettingsPane() { | 248 _createSettingsPane() { |
247 this._showSettingsPaneSetting = Common.settings.createSetting('timelineShowS
ettingsToolbar', false); | 249 this._showSettingsPaneSetting = Common.settings.createSetting('timelineShowS
ettingsToolbar', false); |
248 this._showSettingsPaneButton = new UI.ToolbarSettingToggle( | 250 this._showSettingsPaneButton = new UI.ToolbarSettingToggle( |
(...skipping 1054 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1303 return true; | 1305 return true; |
1304 case 'timeline.jump-to-next-frame': | 1306 case 'timeline.jump-to-next-frame': |
1305 panel._jumpToFrame(1); | 1307 panel._jumpToFrame(1); |
1306 return true; | 1308 return true; |
1307 } | 1309 } |
1308 return false; | 1310 return false; |
1309 } | 1311 } |
1310 }; | 1312 }; |
1311 | 1313 |
1312 Timeline.TimelinePanel._traceProviderSettingSymbol = Symbol('traceProviderSettin
g'); | 1314 Timeline.TimelinePanel._traceProviderSettingSymbol = Symbol('traceProviderSettin
g'); |
OLD | NEW |