Chromium Code Reviews| 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="chrome://resources/polymer/v1_0/font-roboto/roboto.html "> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/font-roboto/roboto.html "> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-slider/paper-slid er.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-slider/paper-slid er.html"> |
| 10 <link rel="import" href="volume_controller.html"> | 10 <link rel="import" href="volume_controller.html"> |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 43 on-click="playClick"> | 43 on-click="playClick"> |
| 44 </files-icon-button> | 44 </files-icon-button> |
| 45 | 45 |
| 46 <!-- Next button in the bottom line. --> | 46 <!-- Next button in the bottom line. --> |
| 47 <files-icon-button | 47 <files-icon-button |
| 48 id="next" | 48 id="next" |
| 49 class="next media-button" | 49 class="next media-button" |
| 50 on-click="nextClick"> | 50 on-click="nextClick"> |
| 51 </files-icon-button> | 51 </files-icon-button> |
| 52 | 52 |
| 53 <div id="volumeContainer" | |
| 54 class="default-hidden" | |
| 55 anchor-point="bottom center"> | |
| 56 <volume-controller id="volumeSlider" value="{{volume}}" | |
|
yawano
2015/12/01 07:51:31
If volume-controller is no longer used, please del
fukino
2015/12/02 04:52:02
Done.
| |
| 57 width="32" height="85" value="50"> | |
| 58 </volume-controller> | |
| 59 | |
| 60 <polymer-anchor-point id="anchorHelper"></polymer-anchor-point> | |
| 61 </div> | |
| 62 | |
| 63 <!-- Volume button in the bottom line. --> | |
| 64 <files-icon-button toggles | |
| 65 id="volumeButton" | |
| 66 class="volume media-button toggle" | |
| 67 anchor-point="bottom center" | |
| 68 active="{{volumeSliderShown}}"> | |
| 69 </files-icon-button> | |
| 70 | |
| 71 <!-- Playlist button in the bottom line. --> | 53 <!-- Playlist button in the bottom line. --> |
| 72 <files-icon-button toggles | 54 <files-icon-button toggles |
| 73 id="playList" | 55 id="playList" |
| 74 class="playlist media-button toggle" | 56 class="playlist media-button toggle" |
| 75 active="{{expanded}}"> | 57 active="{{expanded}}"> |
| 76 </files-icon-button> | 58 </files-icon-button> |
| 77 </div> | 59 </div> |
| 78 <div class="lower-controls time-controls"> | 60 <div class="lower-controls time-volume-controls"> |
| 61 <!-- Play/pause button and seek slider in the bottom line. --> | |
| 79 <div class="time-container"> | 62 <div class="time-container"> |
| 80 <div class="time-spacer">[[computeTimeString_(duration, duration)]]</d iv> | 63 <div class="time-spacer">[[computeTimeString_(duration, duration)]]</d iv> |
| 81 <div class="time">[[computeTimeString_(time, duration)]]</div> | 64 <div class="time">[[computeTimeString_(time, duration)]]</div> |
| 82 </div> | 65 </div> |
| 83 <paper-slider id="timeSlider" max="[[duration]]" value="{{time::change}} "></paper-slider> | 66 <paper-slider id="timeSlider" max="[[duration]]" value="{{time::change}} "></paper-slider> |
| 67 | |
| 68 <!-- Volume button and slider in the bottom line. --> | |
| 69 <files-icon-button | |
| 70 id="volumeButton" | |
| 71 class="volume media-button" | |
| 72 on-click="volumeClick"> | |
| 73 </files-icon-button> | |
| 74 <paper-slider id="volumeSlider"></paper-slider> | |
| 84 </div> | 75 </div> |
| 85 </div> | 76 </div> |
| 86 </template> | 77 </template> |
| 87 </dom-module> | 78 </dom-module> |
| 88 | 79 |
| 89 <script src="control_panel.js"></script> | 80 <script src="control_panel.js"></script> |
| OLD | NEW |