Index: ui/file_manager/audio_player/elements/control_panel.html |
diff --git a/ui/file_manager/audio_player/elements/control_panel.html b/ui/file_manager/audio_player/elements/control_panel.html |
index b2ab5278ed133c4ff19880ab7491d2e5ea9cf724..8cc7ee254ce48cc56d78b32c329be4af8dabc05e 100644 |
--- a/ui/file_manager/audio_player/elements/control_panel.html |
+++ b/ui/file_manager/audio_player/elements/control_panel.html |
@@ -6,7 +6,6 @@ |
<link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> |
<link rel="import" href="chrome://resources/polymer/v1_0/font-roboto/roboto.html"> |
-<link rel="import" href="chrome://resources/polymer/v1_0/paper-slider/paper-slider.html"> |
<link rel="import" href="volume_controller.html"> |
<link rel="import" href="chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj/foreground/elements/files_ripple.html"> |
<link rel="import" href="chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj/foreground/elements/files_toggle_ripple.html"> |
@@ -15,7 +14,24 @@ |
<link rel="import" type="css" href="control_panel.css"> |
<template> |
<div class="controls"> |
- <div class="upper-controls audio-controls"> |
+ <div class="upper-controls time-controls"> |
+ <div class="time media-control"> |
+ <div class="current">[[time2string_(time)]]</div> |
+ </div> |
+ <div class="progress media-control custom-slider"> |
+ <input id="timeInput" name="timeInput" type="range" touch-action="manipulation" |
+ min="0" max="[[duration]]" value="{{time::input}}"> |
+ <div class="bar"> |
+ <div class="filled" style$="[[computeProgressBarStyle_(time, duration)]]"></div> |
+ <div class="cap left"></div> |
+ <div class="cap right"></div> |
+ </div> |
+ </div> |
+ <div class="time media-control"> |
+ <div class="duration">[[time2string_(duration)]]</div> |
+ </div> |
+ </div> |
+ <div class="lower-controls audio-controls"> |
<!-- Shuffle toggle button in the bottom line. --> |
<button class="shuffle-mode media-button toggle" state="default"> |
<label> |
@@ -48,7 +64,7 @@ |
</button> |
<!-- Play button in the bottom line. --> |
- <button class="play media-button" |
+ <button class="play media-control media-button" |
state$="[[computePlayState_(playing)]]" |
on-click="playClick"> |
<div class="normal playing"></div> |
@@ -99,13 +115,6 @@ |
<files-toggle-ripple activated="[[expanded]]"></files-toggle-ripple> |
</button> |
</div> |
- <div class="lower-controls time-controls"> |
- <div class="time-container"> |
- <div class="time-spacer">[[computeTimeString_(duration, duration)]]</div> |
- <div class="time">[[computeTimeString_(time, duration)]]</div> |
- </div> |
- <paper-slider id="timeSlider" max="[[duration]]" value="{{time::change}}"></paper-slider> |
- </div> |
</div> |
</template> |
</dom-module> |