| 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 363 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   374     } |   374     } | 
|   375     return setting; |   375     return setting; | 
|   376   } |   376   } | 
|   377  |   377  | 
|   378   /** |   378   /** | 
|   379    * @return {!UI.ToolbarComboBox} |   379    * @return {!UI.ToolbarComboBox} | 
|   380    */ |   380    */ | 
|   381   _createNetworkConditionsSelect() { |   381   _createNetworkConditionsSelect() { | 
|   382     var toolbarItem = new UI.ToolbarComboBox(null); |   382     var toolbarItem = new UI.ToolbarComboBox(null); | 
|   383     toolbarItem.setMaxWidth(140); |   383     toolbarItem.setMaxWidth(140); | 
|   384     Components.NetworkConditionsSelector.decorateSelect(toolbarItem.selectElemen
      t()); |   384     NetworkConditions.NetworkConditionsSelector.decorateSelect(toolbarItem.selec
      tElement()); | 
|   385     return toolbarItem; |   385     return toolbarItem; | 
|   386   } |   386   } | 
|   387  |   387  | 
|   388   _prepareToLoadTimeline() { |   388   _prepareToLoadTimeline() { | 
|   389     console.assert(this._state === Timeline.TimelinePanel.State.Idle); |   389     console.assert(this._state === Timeline.TimelinePanel.State.Idle); | 
|   390     this._setState(Timeline.TimelinePanel.State.Loading); |   390     this._setState(Timeline.TimelinePanel.State.Loading); | 
|   391   } |   391   } | 
|   392  |   392  | 
|   393   _createFileSelector() { |   393   _createFileSelector() { | 
|   394     if (this._fileSelectorElement) |   394     if (this._fileSelectorElement) | 
| (...skipping 1154 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1549         return true; |  1549         return true; | 
|  1550       case 'timeline.jump-to-next-frame': |  1550       case 'timeline.jump-to-next-frame': | 
|  1551         panel._jumpToFrame(1); |  1551         panel._jumpToFrame(1); | 
|  1552         return true; |  1552         return true; | 
|  1553     } |  1553     } | 
|  1554     return false; |  1554     return false; | 
|  1555   } |  1555   } | 
|  1556 }; |  1556 }; | 
|  1557  |  1557  | 
|  1558 Timeline.TimelinePanel._traceProviderSettingSymbol = Symbol('traceProviderSettin
      g'); |  1558 Timeline.TimelinePanel._traceProviderSettingSymbol = Symbol('traceProviderSettin
      g'); | 
| OLD | NEW |