Gallery.app: Remove old Gallery files.

ui/file_manager/gallery/js/background.js

 // Copyright 2014 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 {Object.<string, string>} stringData String data.
  * @param {VolumeManager} volumeManager Volume manager.
  */
@@ skipping 75 matching lines @@
       return readEntries().then(function(nextEntries) {
         return entries.concat(nextEntries);
       });
     });
   };
   return readEntries();
 }
 
 /**
  * Promise to be fulfilled with single application window.
- * @param {AppWindow}
+ * @type {Promise}
  */
-var appWindowPromise = null;
+var appWindowPromise = Promise.resolve(null);
+
+/**
+ * Promise to be fulfilled with the current window is closed.
+ * @type {Promise}
+ */
+var closingPromise = Promise.resolve(null);
 
 chrome.app.runtime.onLaunched.addListener(function(launchData) {
   // Skip if files are not selected.
   if (!launchData || !launchData.items || launchData.items.length == 0)
     return;
 
   // Obtains entries in non-isolated file systems.
   // The entries in launchData are stored in the isolated file system.
   // We need to map the isolated entries to the normal entries to retrieve their
   // parent directory.
@@ skipping 20 matching lines @@
   // Store the selected and all entries to the launchData.
   launchData.entriesPromise = Promise.all([selectedEntriesPromise,
                                            allEntriesPromise]).then(
       function(args) {
         return Object.freeze({
           selectedEntries: args[0],
           allEntries: args[1]
         });
       });
 
-  // Close previous window.
-  var closePromise;
-  if (appWindowPromise) {
-    closePromise = appWindowPromise.then(function(appWindow) {
-      return new Promise(function(fulfill) {
-        appWindow.close();
-        appWindow.onClosed.addListener(fulfill);
-      });
-    });
-  } else {
-    closePromise = Promise.resolve();
-  }
-  var createdWindowPromise = closePromise.then(function() {
+  // If there is the previous window, close the window.
+  appWindowPromise = appWindowPromise.then(function(appWindow) {
+    if (appWindow) {
+      appWindow.close();
+      return closingPromise;
+    }
+  });
+
+  // Create a new window.
+  appWindowPromise = appWindowPromise.then(function() {
     return new Promise(function(fulfill) {
       chrome.app.window.create(
           'gallery.html',
           {
             id: 'gallery',
             minWidth: 160,
             minHeight: 100,
             frame: 'none'
           },
           function(appWindow) {
             appWindow.contentWindow.addEventListener(
                 'load', fulfill.bind(null, appWindow));
+            closingPromise = new Promise(function(fulfill) {
+              appWindow.onClosed.addListener(fulfill);
+            });
           });
     });
   });
+
+  // Initialize the window document.
   appWindowPromise = Promise.all([
-    createdWindowPromise,
+    appWindowPromise,
     backgroundComponentsPromise,
   ]).then(function(args) {
     args[0].contentWindow.initialize(args[1]);
     return args[0];
   });
 
   // Open entries.
   Promise.all([
     appWindowPromise,
     allEntriesPromise,
     selectedEntriesPromise
   ]).then(function(args) {
     args[0].contentWindow.loadEntries(args[1], args[2]);
   }).catch(function(error) {
     console.error(error.stack || error);
   });
 });