| OLD | NEW |
| 1 <!-- | 1 <!-- |
| 2 -- Copyright 2015 The Chromium Authors. All rights reserved. | 2 -- Copyright 2015 The Chromium Authors. All rights reserved. |
| 3 -- Use of this source code is governed by a BSD-style license that can be | 3 -- Use of this source code is governed by a BSD-style license that can be |
| 4 -- found in the LICENSE file. | 4 -- found in the LICENSE file. |
| 5 --> | 5 --> |
| 6 | 6 |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> |
| 8 <link rel="import" href="track_list.html"> | 8 <link rel="import" href="track_list.html"> |
| 9 <link rel="import" href="control_panel.html"> | 9 <link rel="import" href="control_panel.html"> |
| 10 | 10 |
| 11 <dom-module id="audio-player"> | 11 <dom-module id="audio-player"> |
| 12 <link rel="import" type="css" href="audio_player.css"> | 12 <link rel="import" type="css" href="audio_player.css"> |
| 13 <template> | 13 <template> |
| 14 <track-list id="trackList" | 14 <track-list id="trackList" |
| 15 expanded$="[[expanded]]" | 15 expanded$="[[expanded]]" |
| 16 shuffle="[[shuffle]]" | 16 shuffle="[[shuffle]]" |
| 17 current-track-index="{{currentTrackIndex}}" | 17 current-track-index="{{currentTrackIndex}}" |
| 18 on-replay="onReplayCurrentTrack" | 18 on-replay="onReplayCurrentTrack" |
| 19 on-play="onPlayCurrentTrack"></track-list> | 19 on-play="onPlayCurrentTrack"></track-list> |
| 20 <control-panel id="audioController" | 20 <control-panel id="audioController" |
| 21 playing="{{playing}}" | 21 playing="{{playing}}" |
| 22 time="{{time}}" | 22 time="{{time}}" |
| 23 duration="[[duration]]" | 23 duration="[[duration]]" |
| 24 shuffle="{{shuffle}}" | 24 shuffle="{{shuffle}}" |
| 25 repeat="{{repeat}}" | 25 repeat="{{repeat}}" |
| 26 volume="{{volume}}" | 26 volume="{{volume}}" |
| 27 expanded="{{expanded}}" | 27 expanded="{{expanded}}" |
| 28 volume-slider-shown="{{volumeSliderShown}}" | 28 volume-slider-shown="{{volumeSliderShown}}" |
| 29 aria-labels="[[ariaLabels]]" |
| 29 on-next-clicked="onControllerNextClicked" | 30 on-next-clicked="onControllerNextClicked" |
| 30 on-previous-clicked="onControllerPreviousClicked"></control-panel> | 31 on-previous-clicked="onControllerPreviousClicked"></control-panel> |
| 31 <audio id="audio" | 32 <audio id="audio" |
| 32 volume="[[computeAudioVolume_(volume)]]"></audio> | 33 volume="[[computeAudioVolume_(volume)]]"></audio> |
| 33 </template> | 34 </template> |
| 34 </dom-module> | 35 </dom-module> |
| 35 | 36 |
| 36 <script src="audio_player.js"></script> | 37 <script src="audio_player.js"></script> |
| OLD | NEW |