[AudioPlayer] Don't start a playback automatically when reopening

chrome/browser/resources/file_manager/background/js/background.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';
 
 /**
  * Number of runtime errors catched in the background page.
  * @type {number}
  */
@@ skipping 276 matching lines @@
  * @param {string} iconPath Path of the icon.
  */
 AppWindowWrapper.prototype.setIcon = function(iconPath) {
   this.window_.setIcon(iconPath);
 };
 
 /**
  * Opens the window.
  *
  * @param {Object} appState App state.
+ * @param {boolean} reopen True if the launching is triggered automatically.
+ *     False otherwize.
  * @param {function()=} opt_callback Completion callback.
  */
-AppWindowWrapper.prototype.launch = function(appState, opt_callback) {
+AppWindowWrapper.prototype.launch = function(appState, reopen, opt_callback) {
   // Check if the window is opened or not.
   if (this.openingOrOpened_) {
     console.error('The window is already opened.');
     if (opt_callback)
       opt_callback();
     return;
   }
   this.openingOrOpened_ = true;
 
   // Save application state.
@@ skipping 75 matching lines @@
           nextBottom % screen.availHeight : nextTop;
     }
     this.window_.moveTo(candidateBounds.left, candidateBounds.top);
 
     // Save the properties.
     var appWindow = this.window_;
     background.appWindows[this.id_] = appWindow;
     var contentWindow = appWindow.contentWindow;
     contentWindow.appID = this.id_;
     contentWindow.appState = this.appState_;
+    contentWindow.appReopen = reopen;
     contentWindow.appInitialURL = this.url_;
     if (window.IN_TEST)
       contentWindow.IN_TEST = true;
 
     // Register event listners.
     appWindow.onBoundsChanged.addListener(this.onBoundsChanged_.bind(this));
     appWindow.onClosed.addListener(this.onClosed_.bind(this));
 
     // Callback.
     if (opt_callback)
@@ skipping 62 matching lines @@
  * Inherits from AppWindowWrapper.
  */
 SingletonAppWindowWrapper.prototype = {__proto__: AppWindowWrapper.prototype};
 
 /**
  * Open the window.
  *
  * Activates an existing window or creates a new one.
  *
  * @param {Object} appState App state.
+ * @param {boolean} reopen True if the launching is triggered automatically.
+ *     False otherwize.
  * @param {function()=} opt_callback Completion callback.
  */
-SingletonAppWindowWrapper.prototype.launch = function(appState, opt_callback) {
+SingletonAppWindowWrapper.prototype.launch =
+    function(appState, reopen, opt_callback) {
   // If the window is not opened yet, just call the parent method.
   if (!this.openingOrOpened_) {
-    AppWindowWrapper.prototype.launch.call(this, appState, opt_callback);
+    AppWindowWrapper.prototype.launch.call(
+        this, appState, reopen, opt_callback);
     return;
   }
 
   // If the window is already opened, reload the window.
   // The queue is used to wait until the window is opened.
   this.queue.run(function(nextStep) {
     this.window_.contentWindow.appState = appState;
+    this.window_.contentWindow.appReopen = reopen;
     this.window_.contentWindow.reload();
     if (opt_callback)
       opt_callback();
     nextStep();
   }.bind(this));
 };
 
 /**
  * Reopen a window if its state is saved in the local storage.
  * @param {function()=} opt_callback Completion callback.
  */
 SingletonAppWindowWrapper.prototype.reopen = function(opt_callback) {
   chrome.storage.local.get(this.id_, function(items) {
     var value = items[this.id_];
     if (!value) {
       opt_callback && opt_callback();
       return;  // No app state persisted.
     }
 
     try {
       var appState = JSON.parse(value);
     } catch (e) {
       console.error('Corrupt launch data for ' + this.id_, value);
       opt_callback && opt_callback();
       return;
     }
-    this.launch(appState, opt_callback);
+    this.launch(appState, true, opt_callback);
   }.bind(this));
 };
 
 /**
  * Prefix for the file manager window ID.
  */
 var FILES_ID_PREFIX = 'files#';
 
 /**
  * Regexp matching a file manager window ID.
@@ skipping 123 matching lines @@
     // for other types.
 
     var id = opt_id || nextFileManagerWindowID;
     nextFileManagerWindowID = Math.max(nextFileManagerWindowID, id + 1);
     var appId = FILES_ID_PREFIX + id;
 
     var appWindow = new AppWindowWrapper(
         'main.html',
         appId,
         FILE_MANAGER_WINDOW_CREATE_OPTIONS);
-    appWindow.launch(opt_appState || {}, function() {
+    appWindow.launch(opt_appState || {}, false, function() {
       AppWindowWrapper.focusOnDesktop(
           appWindow.window_, (opt_appState || {}).displayedId);
       if (opt_callback)
         opt_callback(appId);
       onTaskCompleted();
     });
   });
 }
 
 /**
@@ skipping 105 matching lines @@
 });
 
 /**
  * Launches the audio player.
  * @param {Object} playlist Playlist.
  * @param {string=} opt_displayedId ProfileID of the desktop where the audio
  *     player should show.
  */
 function launchAudioPlayer(playlist, opt_displayedId) {
   audioPlayerInitializationQueue.run(function(callback) {
-    audioPlayer.launch(playlist, function(appWindow) {
+    audioPlayer.launch(playlist, false, function(appWindow) {
       audioPlayer.setIcon(AUDIO_PLAYER_ICON);
       AppWindowWrapper.focusOnDesktop(audioPlayer.rawAppWindow,
                                       opt_displayedId);
     });
     callback();
   });
 }
 
 var videoPlayer = new SingletonAppWindowWrapper('video_player.html',
                                                 {hidden: true});
 
 /**
  * Launches the video player.
  * @param {string} url Video url.
  * @param {string=} opt_displayedId ProfileID of the desktop where the video
  *     player should show.
  */
 function launchVideoPlayer(url, opt_displayedId) {
-  videoPlayer.launch({url: url}, function(appWindow) {
+  videoPlayer.launch({url: url}, false, function(appWindow) {
     AppWindowWrapper.focusOnDesktop(videoPlayer.rawAppWindow, opt_displayedId);
   });
 }
 
 /**
  * Launches the app.
  * @private
  */
 Background.prototype.onLaunched_ = function() {
   if (nextFileManagerWindowID == 0) {
@@ skipping 96 matching lines @@
     contexts: ['launcher'],
     title: str('NEW_WINDOW_BUTTON_LABEL')
   });
 };
 
 /**
  * Singleton instance of Background.
  * @type {Background}
  */
 window.background = new Background();