Merge 143578 - [filemanager] Moved summarizeSelection call sooner in initialization.

chrome/browser/resources/file_manager/js/file_manager.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.
 
 /**
  * FileManager constructor.
  *
  * FileManager objects encapsulate the functionality of the file selector
  * dialogs, as well as the full screen file manager application (though the
  * latter is not yet implemented).
@@ skipping 484 matching lines @@
     });
     dm.addEventListener('scan-started', this.showSpinnerLater_.bind(this));
     dm.addEventListener('scan-completed', this.showSpinner_.bind(this, false));
     dm.addEventListener('scan-completed',
                         this.refreshCurrentDirectoryMetadata_.bind(this));
     dm.addEventListener('rescan-completed',
                         this.refreshCurrentDirectoryMetadata_.bind(this));
     this.addEventListener('selection-summarized',
                           this.onSelectionSummarized_.bind(this));
 
+    this.summarizeSelection_();
+
     this.setupCurrentDirectory_(true /* page loading */);
 
     var stateChangeHandler =
         this.onNetworkStateOrGDataPreferencesChanged_.bind(this);
     chrome.fileBrowserPrivate.onGDataPreferencesChanged.addListener(
         stateChangeHandler);
     chrome.fileBrowserPrivate.onNetworkConnectionChanged.addListener(
         stateChangeHandler);
     stateChangeHandler();
 
-    this.summarizeSelection_();
-
     var sortField =
         window.localStorage['sort-field-' + this.dialogType_] ||
         'modificationTime';
     var sortDirection =
         window.localStorage['sort-direction-' + this.dialogType_] || 'desc';
     this.directoryModel_.sortFileList(sortField, sortDirection);
 
     this.refocus();
 
     if (this.dialogType_ == FileManager.DialogType.FULL_PAGE)
@@ skipping 3698 matching lines @@
       this.resolvePath(this.getCurrentDirectory() + '/' + filename,
           resolveCallback, resolveCallback);
       return;
     }
 
     var files = [];
     var selectedIndexes = this.currentList_.selectionModel.selectedIndexes;
 
     if (this.dialogType_ == FileManager.DialogType.SELECT_FOLDER &&
         selectedIndexes.length == 0) {
-      var url = this.getSearchOrCurrentDirectoryURL();
+      var url = this.getCurrentDirectoryURL();
       var singleSelection = {
         urls: [url],
         multiple: false,
         filterIndex: this.getSelectedFilterIndex_(url)
       };
       this.selectFilesAndClose_(singleSelection);
       return;
     }
 
     // All other dialog types require at least one selected list item.
@@ skipping 336 matching lines @@
     function closeBanner() {
       self.cleanupGDataWelcome_();
       // Stop showing the welcome banner.
       localStorage[WELCOME_HEADER_COUNTER_KEY] = WELCOME_HEADER_COUNTER_LIMIT;
     }
 
     return maybeShowBanner;
   };
 })();