[AudioPlayer] Fix a bug on changing 'expanded' status

chrome/browser/resources/file_manager/audio_player/js/audio_player.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 'use strict';
 
 /**
  * @param {HTMLElement} container Container element.
  * @constructor
  */
 function AudioPlayer(container) {
   this.container_ = container;
   this.volumeManager_ = new VolumeManagerWrapper(
       VolumeManagerWrapper.DriveEnabledStatus.DRIVE_ENABLED);
   this.metadataCache_ = MetadataCache.createFull(this.volumeManager_);
   this.selectedEntry_ = null;
 
   this.model_ = new AudioPlayerModel();
   var observer = new PathObserver(this.model_, 'expanded');
   observer.open(function(newValue, oldValue) {
     // Inverse arguments intentionally to match the Polymer way.
     this.onModelExpandedChanged(oldValue, newValue);
   }.bind(this));
-  this.trackListItems_ = [];
 
   this.entries_ = [];
   this.currentTrackIndex_ = -1;
   this.playlistGeneration_ = 0;
 
   /**
    * Whether if the playlist is expanded or not. This value is changed by
    * this.syncExpanded().
    * True: expanded, false: collapsed, null: unset.
    *
    * @type {?boolean}
    * @private
    */
   this.isExpanded_ = null;  // Initial value is null. It'll be set in load().
 
   this.player_ = document.querySelector('audio-player');
-  this.player_.tracks = this.trackListItems_;
+  // TODO(yoshiki): Move tracks into the model.
+  this.player_.tracks = [];
   this.player_.model = this.model_;
   Platform.performMicrotaskCheckpoint();
 
   this.errorString_ = '';
   this.offlineString_ = '';
   chrome.fileBrowserPrivate.getStrings(function(strings) {
     container.ownerDocument.title = strings['AUDIO_PLAYER_TITLE'];
     this.errorString_ = strings['AUDIO_ERROR'];
     this.offlineString_ = strings['AUDIO_OFFLINE'];
     AudioPlayer.TrackInfo.DEFAULT_ARTIST =
@@ skipping 44 matching lines @@
  */
 AudioPlayer.prototype.load = function(playlist) {
   this.playlistGeneration_++;
   this.currentTrackIndex_ = -1;
 
   // Save the app state, in case of restart. Make a copy of the object, so the
   // playlist member is not changed after entries are resolved.
   window.appState = JSON.parse(JSON.stringify(playlist));  // cloning
   util.saveAppState();
 
+  this.isExpanded_ = this.model_.expanded;
+
   // Resolving entries has to be done after the volume manager is initialized.
   this.volumeManager_.ensureInitialized(function() {
     util.URLsToEntries(playlist.items, function(entries) {
       this.entries_ = entries;
 
       var position = playlist.position || 0;
       var time = playlist.time || 0;
 
       if (this.entries_.length == 0)
         return;
 
-      this.trackListItems_.splice(0);
+      var newTracks = [];
 
       for (var i = 0; i != this.entries_.length; i++) {
         var entry = this.entries_[i];
         var onClick = this.select_.bind(this, i, false /* no restore */);
-        this.trackListItems_.push(new AudioPlayer.TrackInfo(entry, onClick));
+        newTracks.push(new AudioPlayer.TrackInfo(entry, onClick));
       }
 
+      this.player_.tracks = newTracks;
+
       // Makes it sure that the handler of the track list is called, before the
       // handler of the track index.
       Platform.performMicrotaskCheckpoint();
 
       this.select_(position, !!time);
 
       // Load the selected track metadata first, then load the rest.
       this.loadMetadata_(position);
       for (i = 0; i != this.entries_.length; i++) {
         if (i != position)
@@ skipping 14 matching lines @@
 };
 
 /**
  * Displays track's metadata.
  * @param {number} track Track number.
  * @param {Object} metadata Metadata object.
  * @param {string=} opt_error Error message.
  * @private
  */
 AudioPlayer.prototype.displayMetadata_ = function(track, metadata, opt_error) {
-  this.trackListItems_[track].setMetadata(metadata, opt_error);
+  this.player_.tracks[track].setMetadata(metadata, opt_error);
 };
 
 /**
  * Closes audio player when a volume containing the selected item is unmounted.
  * @param {Event} event The unmount event.
  * @private
  */
 AudioPlayer.prototype.onExternallyUnmounted_ = function(event) {
   if (!this.selectedEntry_)
     return;
@@ skipping 91 matching lines @@
   }
 };
 
 /* Keep the below constants in sync with the CSS. */
 
 /**
  * Window header size in pixels.
  * @type {number}
  * @const
  */
-AudioPlayer.HEADER_HEIGHT = 28;
+AudioPlayer.HEADER_HEIGHT = 33;  // 32px + border 1px
 
 /**
  * Track height in pixels.
  * @type {number}
  * @const
  */
 AudioPlayer.TRACK_HEIGHT = 44;
 
 /**
  * Controls bar height in pixels.
  * @type {number}
  * @const
  */
-AudioPlayer.CONTROLS_HEIGHT = 72;
+AudioPlayer.CONTROLS_HEIGHT = 73;  // 72px + border 1px
 
 /**
  * Default number of items in the expanded mode.
  * @type {number}
  * @const
  */
 AudioPlayer.DEFAULT_EXPANDED_ITEMS = 5;
 
 /**
  * Minimum size of the window in the expanded mode in pixels.
@@ skipping 12 matching lines @@
   if (this.isExpanded_ !== null &&
       this.isExpanded_ === newValue)
     return;
 
   if (this.isExpanded_ && !newValue)
     this.lastExpandedHeight_ = window.innerHeight;
 
   if (this.isExpanded_ !== newValue) {
     this.isExpanded_ = newValue;
     this.syncHeight_();
+
+    // Saves new state.
+    window.appState.expanded = newValue;
+    util.saveAppState();
   }
 };
 
 /**
  * @private
  */
 AudioPlayer.prototype.syncHeight_ = function() {
   var targetHeight;
 
   if (this.model_.expanded) {
@@ skipping 77 matching lines @@
   this.title = (metadata.media && metadata.media.title) ||
       this.getDefaultTitle();
   this.artist = error ||
       (metadata.media && metadata.media.artist) || this.getDefaultArtist();
 };
 
 // Starts loading the audio player.
 window.addEventListener('WebComponentsReady', function(e) {
   AudioPlayer.load();
 });