| 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 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 // View | 294 // View |
| 295 this._panelToolbar.appendSeparator(); | 295 this._panelToolbar.appendSeparator(); |
| 296 this._showScreenshotsToolbarCheckbox = this._createSettingCheckbox( | 296 this._showScreenshotsToolbarCheckbox = this._createSettingCheckbox( |
| 297 Common.UIString('Screenshots'), this._showScreenshotsSetting, Common.UIS
tring('Capture screenshots')); | 297 Common.UIString('Screenshots'), this._showScreenshotsSetting, Common.UIS
tring('Capture screenshots')); |
| 298 this._panelToolbar.appendToolbarItem(this._showScreenshotsToolbarCheckbox); | 298 this._panelToolbar.appendToolbarItem(this._showScreenshotsToolbarCheckbox); |
| 299 | 299 |
| 300 this._showMemoryToolbarCheckbox = this._createSettingCheckbox( | 300 this._showMemoryToolbarCheckbox = this._createSettingCheckbox( |
| 301 Common.UIString('Memory'), this._showMemorySetting, Common.UIString('Sho
w memory timeline.')); | 301 Common.UIString('Memory'), this._showMemorySetting, Common.UIString('Sho
w memory timeline.')); |
| 302 this._panelToolbar.appendToolbarItem(this._showMemoryToolbarCheckbox); | 302 this._panelToolbar.appendToolbarItem(this._showMemoryToolbarCheckbox); |
| 303 | 303 |
| 304 // Settings | |
| 305 this._panelToolbar.appendToolbarItem(this._showSettingsPaneButton); | |
| 306 | |
| 307 // GC | 304 // GC |
| 308 this._panelToolbar.appendToolbarItem(UI.Toolbar.createActionButtonForId('com
ponents.collect-garbage')); | 305 this._panelToolbar.appendToolbarItem(UI.Toolbar.createActionButtonForId('com
ponents.collect-garbage')); |
| 306 |
| 307 // Settings |
| 308 this._panelToolbar.appendSpacer(); |
| 309 this._panelToolbar.appendText(''); |
| 310 this._panelToolbar.appendSeparator(); |
| 311 this._panelToolbar.appendToolbarItem(this._showSettingsPaneButton); |
| 309 } | 312 } |
| 310 | 313 |
| 311 _createSettingsPane() { | 314 _createSettingsPane() { |
| 312 this._showSettingsPaneSetting = Common.settings.createSetting('timelineShowS
ettingsToolbar', false); | 315 this._showSettingsPaneSetting = Common.settings.createSetting('timelineShowS
ettingsToolbar', false); |
| 313 this._showSettingsPaneButton = new UI.ToolbarSettingToggle( | 316 this._showSettingsPaneButton = new UI.ToolbarSettingToggle( |
| 314 this._showSettingsPaneSetting, 'largeicon-settings-gear', Common.UIStrin
g('Capture settings')); | 317 this._showSettingsPaneSetting, 'largeicon-settings-gear', Common.UIStrin
g('Capture settings')); |
| 315 SDK.multitargetNetworkManager.addEventListener( | 318 SDK.multitargetNetworkManager.addEventListener( |
| 316 SDK.MultitargetNetworkManager.Events.ConditionsChanged, this._updateShow
SettingsToolbarButton, this); | 319 SDK.MultitargetNetworkManager.Events.ConditionsChanged, this._updateShow
SettingsToolbarButton, this); |
| 317 this._cpuThrottlingManager.addEventListener( | 320 this._cpuThrottlingManager.addEventListener( |
| 318 Components.CPUThrottlingManager.Events.RateChanged, this._updateShowSett
ingsToolbarButton, this); | 321 Components.CPUThrottlingManager.Events.RateChanged, this._updateShowSett
ingsToolbarButton, this); |
| (...skipping 1216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1535 return true; | 1538 return true; |
| 1536 case 'timeline.jump-to-next-frame': | 1539 case 'timeline.jump-to-next-frame': |
| 1537 panel._jumpToFrame(1); | 1540 panel._jumpToFrame(1); |
| 1538 return true; | 1541 return true; |
| 1539 } | 1542 } |
| 1540 return false; | 1543 return false; |
| 1541 } | 1544 } |
| 1542 }; | 1545 }; |
| 1543 | 1546 |
| 1544 Timeline.TimelinePanel._traceProviderSettingSymbol = Symbol('traceProviderSettin
g'); | 1547 Timeline.TimelinePanel._traceProviderSettingSymbol = Symbol('traceProviderSettin
g'); |
| OLD | NEW |