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

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

Issue 1432393003: Revert of 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">
10 <link rel="import" href="chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj/for eground/elements/files_ripple.html"> 11 <link rel="import" href="chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj/for eground/elements/files_ripple.html">
11 <link rel="import" href="chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj/for eground/elements/files_toggle_ripple.html"> 12 <link rel="import" href="chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj/for eground/elements/files_toggle_ripple.html">
12 13
13 <dom-module id="control-panel"> 14 <dom-module id="control-panel">
14 <link rel="import" type="css" href="control_panel.css"> 15 <link rel="import" type="css" href="control_panel.css">
15 <template> 16 <template>
16 <div class="controls"> 17 <div class="controls">
17 <div class="control-row volume-controls" hidden="[[!volumeSliderShown]]"> 18 <div class="upper-controls audio-controls">
18 <paper-slider id="volumeSlider" value="{{volume::change}}"></paper-slide r>
19 </div>
20 <div class="control-row audio-controls">
21 <!-- Shuffle toggle button in the bottom line. --> 19 <!-- Shuffle toggle button in the bottom line. -->
22 <button class="shuffle-mode media-button toggle" state="default"> 20 <button class="shuffle-mode media-button toggle" state="default">
23 <label> 21 <label>
24 <input id="shuffleCheckbox" 22 <input id="shuffleCheckbox"
25 type="checkbox" 23 type="checkbox"
26 checked="{{shuffle::change}}"> 24 checked="{{shuffle::change}}">
27 <span class="icon"></span> 25 <span class="icon"></span>
28 </label> 26 </label>
29 <files-toggle-ripple activated="[[shuffle]]"></files-toggle-ripple> 27 <files-toggle-ripple activated="[[shuffle]]"></files-toggle-ripple>
30 </button> 28 </button>
(...skipping 30 matching lines...) Expand all
61 59
62 <!-- Next button in the bottom line. --> 60 <!-- Next button in the bottom line. -->
63 <button class="next media-button" 61 <button class="next media-button"
64 state="default" 62 state="default"
65 on-click="nextClick"> 63 on-click="nextClick">
66 <div class="normal default"></div> 64 <div class="normal default"></div>
67 <div class="disabled"></div> 65 <div class="disabled"></div>
68 <files-ripple></files-ripple> 66 <files-ripple></files-ripple>
69 </button> 67 </button>
70 68
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
71 <!-- Volume button in the bottom line. --> 79 <!-- Volume button in the bottom line. -->
72 <button id="volumeButton" 80 <button id="volumeButton"
73 class="volume media-button toggle" 81 class="volume media-button toggle"
74 state="default" 82 state="default"
75 anchor-point="bottom center"> 83 anchor-point="bottom center">
76 <label> 84 <label>
77 <input type="checkbox" checked="{{volumeSliderShown::change}}"> 85 <input type="checkbox" checked="{{volumeSliderShown::change}}">
78 <span class="icon"></span> 86 <span class="icon"></span>
79 </label> 87 </label>
80 <files-toggle-ripple activated="[[volumeSliderShown]]"></files-toggle- ripple> 88 <files-toggle-ripple activated="[[volumeSliderShown]]"></files-toggle- ripple>
81 </button> 89 </button>
82 90
83 <!-- Playlist button in the bottom line. --> 91 <!-- Playlist button in the bottom line. -->
84 <button id="playlistButton" 92 <button id="playlistButton"
85 class="playlist media-button toggle" 93 class="playlist media-button toggle"
86 state="default"> 94 state="default">
87 <label> 95 <label>
88 <input type="checkbox" checked="{{expanded::change}}"> 96 <input type="checkbox" checked="{{expanded::change}}">
89 <span class="icon"></span> 97 <span class="icon"></span>
90 </label> 98 </label>
91 <files-toggle-ripple activated="[[expanded]]"></files-toggle-ripple> 99 <files-toggle-ripple activated="[[expanded]]"></files-toggle-ripple>
92 </button> 100 </button>
93 </div> 101 </div>
94 <div class="control-row time-controls"> 102 <div class="lower-controls time-controls">
95 <div class="time-container"> 103 <div class="time-container">
96 <div class="time-spacer">[[computeTimeString_(duration, duration)]]</d iv> 104 <div class="time-spacer">[[computeTimeString_(duration, duration)]]</d iv>
97 <div class="time">[[computeTimeString_(time, duration)]]</div> 105 <div class="time">[[computeTimeString_(time, duration)]]</div>
98 </div> 106 </div>
99 <paper-slider id="timeSlider" max="[[duration]]" value="{{time::change}} "></paper-slider> 107 <paper-slider id="timeSlider" max="[[duration]]" value="{{time::change}} "></paper-slider>
100 </div> 108 </div>
101 </div> 109 </div>
102 </template> 110 </template>
103 </dom-module> 111 </dom-module>
104 112
105 <script src="control_panel.js"></script> 113 <script src="control_panel.js"></script>
OLDNEW
« no previous file with comments | « ui/file_manager/audio_player/elements/control_panel.css ('k') | ui/file_manager/audio_player/elements/control_panel.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698