Simplify directory initialization in Files app.

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 504 matching lines @@
  */
 function launchFileManager(opt_appState, opt_id, opt_type, opt_callback) {
   var type = opt_type || LaunchType.ALWAYS_CREATE;
 
   // Wait until all windows are created.
   background.queue.run(function(onTaskCompleted) {
     // Check if there is already a window with the same path. If so, then
     // reuse it instead of opening a new one.
     if (type == LaunchType.FOCUS_SAME_OR_CREATE ||
         type == LaunchType.FOCUS_ANY_OR_CREATE) {
-      if (opt_appState && opt_appState.defaultPath) {
+      if (opt_appState) {
         for (var key in background.appWindows) {
           if (!key.match(FILES_ID_PATTERN))
             continue;
 
           var contentWindow = background.appWindows[key].contentWindow;
-          if (contentWindow.appState &&
-              opt_appState.defaultPath == contentWindow.appState.defaultPath) {
-            background.appWindows[key].focus();
-            if (opt_callback)
-              opt_callback(key);
-            onTaskCompleted();
-            return;
+          if (!contentWindow.appState)
+            continue;
+
+          // Different current directories.
+          if (opt_appState.currentDirectoryPath !==
+                  contentWindow.appState.currentDirectoryPath) {
+            continue;
           }
+
+          // Selection path specified, and it is different.
+          if (opt_appState.selectionPath &&
+                  opt_appState.selectionPath !==
+                  contentWindow.appState.selectionPath) {
+            continue;
+          }
+
+          background.appWindows[key].focus();
+          if (opt_callback)
+            opt_callback(key);
+          onTaskCompleted();
+          return;
         }
       }
     }
 
     // Focus any window if none is focused. Try restored first.
     if (type == LaunchType.FOCUS_ANY_OR_CREATE) {
       // If there is already a focused window, then finish.
       for (var key in background.appWindows) {
         if (!key.match(FILES_ID_PATTERN))
           continue;
@@ skipping 98 matching lines @@
         if (!launchEnable) {
           nextStep();
           return;
         }
 
         // Every other action opens a Files app window.
         var appState = {
           params: {
             action: action
           },
-          defaultPath: details.entries[0].fullPath
+          // It is not allowed to call getParent() here, since there may be
+          // no permissions to access it at this stage. Therefore we are passing
+          // the selectionPath only, and the currentDirectory will be resolved
+          // later.
+          selectionPath: details.entries[0].fullPath
         };
         // For mounted devices just focus any Files.app window. The mounted
         // volume will appear on the navigation list.
         var type = action == 'auto-open' ? LaunchType.FOCUS_ANY_OR_CREATE :
             LaunchType.FOCUS_SAME_OR_CREATE;
         launchFileManager(appState, /* App ID */ undefined, type, nextStep);
       });
       break;
   }
 };
@@ skipping 88 matching lines @@
  * @private
  */
 Background.prototype.onContextMenuClicked_ = function(info) {
   if (info.menuItemId == 'new-window') {
     // Find the focused window (if any) and use it's current path for the
     // new window. If not found, then launch with the default path.
     for (var key in background.appWindows) {
       try {
         if (background.appWindows[key].contentWindow.isFocused()) {
           var appState = {
-            defaultPath: background.appWindows[key].contentWindow.
-                appState.defaultPath
+            // Do not clone the selection path, only the current directory.
+            currentDirectoryPath: background.appWindows[key].contentWindow.
+                appState.currentDirectoryPath
           };
           launchFileManager(appState);
           return;
         }
       } catch (ignore) {
         // The isFocused method may not be defined during initialization.
         // Therefore, wrapped with a try-catch block.
       }
     }
 
@@ skipping 18 matching lines @@
     contexts: ['launcher'],
     title: str('NEW_WINDOW_BUTTON_LABEL')
   });
 };
 
 /**
  * Singleton instance of Background.
  * @type {Background}
  */
 window.background = new Background();