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

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

Issue 1491543002: AudioPlayer: Update layout to show the volume slider without using popup. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review comments. Created 5 years 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_icon_button.html"> 10 <link rel="import" href="chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj/for eground/elements/files_icon_button.html">
12 11
13 <dom-module id="control-panel"> 12 <dom-module id="control-panel">
14 <link rel="import" type="css" href="control_panel.css"> 13 <link rel="import" type="css" href="control_panel.css">
15 <template> 14 <template>
16 <div class="controls"> 15 <div class="controls">
17 <div class="upper-controls audio-controls"> 16 <div class="upper-controls audio-controls">
18 <!-- Shuffle toggle button in the bottom line. --> 17 <!-- Shuffle toggle button in the bottom line. -->
19 <files-icon-button toggles 18 <files-icon-button toggles
20 id="shuffle" 19 id="shuffle"
(...skipping 22 matching lines...) Expand all
43 on-click="playClick"> 42 on-click="playClick">
44 </files-icon-button> 43 </files-icon-button>
45 44
46 <!-- Next button in the bottom line. --> 45 <!-- Next button in the bottom line. -->
47 <files-icon-button 46 <files-icon-button
48 id="next" 47 id="next"
49 class="next media-button" 48 class="next media-button"
50 on-click="nextClick"> 49 on-click="nextClick">
51 </files-icon-button> 50 </files-icon-button>
52 51
53 <div id="volumeContainer"
54 class="default-hidden"
55 anchor-point="bottom center">
56 <volume-controller id="volumeSlider" value="{{volume}}"
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. --> 52 <!-- Playlist button in the bottom line. -->
72 <files-icon-button toggles 53 <files-icon-button toggles
73 id="playList" 54 id="playList"
74 class="playlist media-button toggle" 55 class="playlist media-button toggle"
75 active="{{expanded}}"> 56 active="{{expanded}}">
76 </files-icon-button> 57 </files-icon-button>
77 </div> 58 </div>
78 <div class="lower-controls time-controls"> 59 <div class="lower-controls time-volume-controls">
60 <!-- Play/pause button and seek slider in the bottom line. -->
79 <div class="time-container"> 61 <div class="time-container">
80 <div class="time-spacer">[[computeTimeString_(duration, duration)]]</d iv> 62 <div class="time-spacer">[[computeTimeString_(duration, duration)]]</d iv>
81 <div class="time">[[computeTimeString_(time, duration)]]</div> 63 <div class="time">[[computeTimeString_(time, duration)]]</div>
82 </div> 64 </div>
83 <paper-slider id="timeSlider" max="[[duration]]" value="{{time::change}} "></paper-slider> 65 <paper-slider id="timeSlider" max="[[duration]]" value="{{time::change}} "></paper-slider>
66
67 <!-- Volume button and slider in the bottom line. -->
68 <files-icon-button
69 id="volumeButton"
70 class="volume media-button"
71 on-click="volumeClick">
72 </files-icon-button>
73 <paper-slider id="volumeSlider"></paper-slider>
84 </div> 74 </div>
85 </div> 75 </div>
86 </template> 76 </template>
87 </dom-module> 77 </dom-module>
88 78
89 <script src="control_panel.js"></script> 79 <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