[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
  */
@@ skipping 85 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);
 
+      // Makes it sure that the track list is now empty to the handler, before
+      // adding new tracks.
+      Platform.performMicrotaskCheckpoint();

[hirono, 2014/03/05 17:24:01]

Just curious, what goes wrong without the line?
I'm guessing it is needed to ensure to assign -1 to currentTrackIndex, but not
sure.

[yoshiki, 2014/03/05 18:30:41]

Yes, that's correct.

[hirono, 2014/03/06 03:44:47]

So how about removing this.trackListItems_ member and reassigning the new track
items to this.player_.tracks here?
It shows the idea of replacing whole the track list more explicitly. We can
remove the hack. And it saves the number of update from ArrayObserver.

[yoshiki, 2014/03/06 08:25:07]

Done

+
       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));
       }
 
       // Makes it sure that the handler of the track list is called, before the
       // handler of the track index.
       Platform.performMicrotaskCheckpoint();
 
@@ skipping 132 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();
 });