Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(269)

Side by Side Diff: ui/file_manager/audio_player/elements/control_panel.html

Issue 1425033006: AudioPlayer: Update volume controls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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">
11 <link rel="import" href="chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj/for eground/elements/files_ripple.html"> 10 <link rel="import" href="chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj/for eground/elements/files_ripple.html">
12 <link rel="import" href="chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj/for eground/elements/files_toggle_ripple.html"> 11 <link rel="import" href="chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj/for eground/elements/files_toggle_ripple.html">
13 12
14 <dom-module id="control-panel"> 13 <dom-module id="control-panel">
15 <link rel="import" type="css" href="control_panel.css"> 14 <link rel="import" type="css" href="control_panel.css">
16 <template> 15 <template>
17 <div class="controls"> 16 <div class="controls">
17 <div class="upper-controls volume-controls" hidden="[[!volumeSliderShown]] ">
yawano 2015/10/30 08:28:25 optional nit: how about to integrate upper-control
fukino 2015/10/30 09:05:25 SGTM! Done.
18 <paper-slider id="volumeSlider" value="{{volume::change}}"></paper-slide r>
19 </div>
18 <div class="upper-controls audio-controls"> 20 <div class="upper-controls audio-controls">
19 <!-- Shuffle toggle button in the bottom line. --> 21 <!-- Shuffle toggle button in the bottom line. -->
20 <button class="shuffle-mode media-button toggle" state="default"> 22 <button class="shuffle-mode media-button toggle" state="default">
21 <label> 23 <label>
22 <input id="shuffleCheckbox" 24 <input id="shuffleCheckbox"
23 type="checkbox" 25 type="checkbox"
24 checked="{{shuffle::change}}"> 26 checked="{{shuffle::change}}">
25 <span class="icon"></span> 27 <span class="icon"></span>
26 </label> 28 </label>
27 <files-toggle-ripple activated="[[shuffle]]"></files-toggle-ripple> 29 <files-toggle-ripple activated="[[shuffle]]"></files-toggle-ripple>
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 61
60 <!-- Next button in the bottom line. --> 62 <!-- Next button in the bottom line. -->
61 <button class="next media-button" 63 <button class="next media-button"
62 state="default" 64 state="default"
63 on-click="nextClick"> 65 on-click="nextClick">
64 <div class="normal default"></div> 66 <div class="normal default"></div>
65 <div class="disabled"></div> 67 <div class="disabled"></div>
66 <files-ripple></files-ripple> 68 <files-ripple></files-ripple>
67 </button> 69 </button>
68 70
69 <div id="volumeContainer"
70 class="default-hidden"
71 anchor-point="bottom center">
72 <volume-controller id="volumeSlider" value="{{volume}}"
73 width="32" height="85" value="50">
74 </volume-controller>
75
76 <polymer-anchor-point id="anchorHelper"></polymer-anchor-point>
77 </div>
78
79 <!-- Volume button in the bottom line. --> 71 <!-- Volume button in the bottom line. -->
80 <button id="volumeButton" 72 <button id="volumeButton"
81 class="volume media-button toggle" 73 class="volume media-button toggle"
82 state="default" 74 state="default"
83 anchor-point="bottom center"> 75 anchor-point="bottom center">
84 <label> 76 <label>
85 <input type="checkbox" checked="{{volumeSliderShown::change}}"> 77 <input type="checkbox" checked="{{volumeSliderShown::change}}">
86 <span class="icon"></span> 78 <span class="icon"></span>
87 </label> 79 </label>
88 <files-toggle-ripple activated="[[volumeSliderShown]]"></files-toggle- ripple> 80 <files-toggle-ripple activated="[[volumeSliderShown]]"></files-toggle- ripple>
(...skipping 12 matching lines...) Expand all
101 </div> 93 </div>
102 <div class="lower-controls time-controls"> 94 <div class="lower-controls time-controls">
103 <div class="time media-control">[[computeTimeString_(time, duration)]]</ div> 95 <div class="time media-control">[[computeTimeString_(time, duration)]]</ div>
104 <paper-slider id="timeSlider" max="[[duration]]" value="{{time::change}} "></paper-slider> 96 <paper-slider id="timeSlider" max="[[duration]]" value="{{time::change}} "></paper-slider>
105 </div> 97 </div>
106 </div> 98 </div>
107 </template> 99 </template>
108 </dom-module> 100 </dom-module>
109 101
110 <script src="control_panel.js"></script> 102 <script src="control_panel.js"></script>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698