Chromium Code Reviews| 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 6e7b5554a8c708953e95a22ecdb9decb42b0c51d..e86727e14618f3648aa09255d9ce9c5a1d026081 100644 |
| --- a/ui/file_manager/audio_player/elements/control_panel.html |
| +++ b/ui/file_manager/audio_player/elements/control_panel.html |
| @@ -7,7 +7,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,6 +14,9 @@ |
| <link rel="import" type="css" href="control_panel.css"> |
| <template> |
| <div class="controls"> |
| + <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.
|
| + <paper-slider id="volumeSlider" value="{{volume::change}}"></paper-slider> |
| + </div> |
| <div class="upper-controls audio-controls"> |
| <!-- Shuffle toggle button in the bottom line. --> |
| <button class="shuffle-mode media-button toggle" state="default"> |
| @@ -66,16 +68,6 @@ |
| <files-ripple></files-ripple> |
| </button> |
| - <div id="volumeContainer" |
| - class="default-hidden" |
| - anchor-point="bottom center"> |
| - <volume-controller id="volumeSlider" value="{{volume}}" |
| - width="32" height="85" value="50"> |
| - </volume-controller> |
| - |
| - <polymer-anchor-point id="anchorHelper"></polymer-anchor-point> |
| - </div> |
| - |
| <!-- Volume button in the bottom line. --> |
| <button id="volumeButton" |
| class="volume media-button toggle" |