| OLD | NEW |
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <!-- | 2 <!-- |
| 3 Copyright (c) 2013 The Chromium Authors. All rights reserved. | 3 Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 4 Use of this source code is governed by a BSD-style license that can be | 4 Use of this source code is governed by a BSD-style license that can be |
| 5 found in the LICENSE file. | 5 found in the LICENSE file. |
| 6 --> | 6 --> |
| 7 | 7 |
| 8 <link rel="import" href="/tracing/base/base64.html"> | 8 <link rel="import" href="/tracing/base/base64.html"> |
| 9 <link rel="import" href="/tracing/importer/import.html"> | 9 <link rel="import" href="/tracing/importer/import.html"> |
| 10 <link rel="import" href="/tracing/ui/base/file.html"> | 10 <link rel="import" href="/tracing/ui/base/file.html"> |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 this.infoBarGroup_ = this.querySelector('tr-ui-b-info-bar-group'); | 85 this.infoBarGroup_ = this.querySelector('tr-ui-b-info-bar-group'); |
| 86 | 86 |
| 87 // Detach the buttons. We will reattach them to the timeline view. | 87 // Detach the buttons. We will reattach them to the timeline view. |
| 88 // TODO(nduca): Make timeline-view have a content select="x-buttons" | 88 // TODO(nduca): Make timeline-view have a content select="x-buttons" |
| 89 // that pulls in any buttons. | 89 // that pulls in any buttons. |
| 90 this.recordButton_ = this.querySelector('#record-button'); | 90 this.recordButton_ = this.querySelector('#record-button'); |
| 91 this.loadButton_ = this.querySelector('#load-button'); | 91 this.loadButton_ = this.querySelector('#load-button'); |
| 92 this.saveButton_ = this.querySelector('#save-button'); | 92 this.saveButton_ = this.querySelector('#save-button'); |
| 93 | 93 |
| 94 var buttons = this.querySelector('x-timeline-view-buttons'); | 94 var buttons = this.querySelector('x-timeline-view-buttons'); |
| 95 buttons.parentElement.removeChild(buttons); | 95 Polymer.dom(buttons.parentElement).removeChild(buttons); |
| 96 Polymer.dom(this.timelineView_.leftControls).appendChild(buttons); | 96 Polymer.dom(this.timelineView_.leftControls).appendChild(buttons); |
| 97 this.initButtons_(); | 97 this.initButtons_(); |
| 98 | 98 |
| 99 this.timelineView_.hotkeyController.addHotKey(new tr.ui.b.HotKey({ | 99 this.timelineView_.hotkeyController.addHotKey(new tr.ui.b.HotKey({ |
| 100 eventType: 'keypress', | 100 eventType: 'keypress', |
| 101 keyCode: 'r'.charCodeAt(0), | 101 keyCode: 'r'.charCodeAt(0), |
| 102 callback: function(e) { | 102 callback: function(e) { |
| 103 this.beginRecording(); | 103 this.beginRecording(); |
| 104 event.stopPropagation(); | 104 event.stopPropagation(); |
| 105 }, | 105 }, |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 360 }); | 360 }); |
| 361 return false; | 361 return false; |
| 362 } | 362 } |
| 363 }; | 363 }; |
| 364 | 364 |
| 365 return { | 365 return { |
| 366 ProfilingView: ProfilingView | 366 ProfilingView: ProfilingView |
| 367 }; | 367 }; |
| 368 }); | 368 }); |
| 369 </script> | 369 </script> |
| OLD | NEW |