| Index: chrome/browser/resources/file_manager/js/file_manager.js
|
| diff --git a/chrome/browser/resources/file_manager/js/file_manager.js b/chrome/browser/resources/file_manager/js/file_manager.js
|
| index 9e7dd167dbaa3422bb03ceb7ef59f6d138eeb573..c48198d8636df76e479db790ff6b5c69587feff1 100644
|
| --- a/chrome/browser/resources/file_manager/js/file_manager.js
|
| +++ b/chrome/browser/resources/file_manager/js/file_manager.js
|
| @@ -18,7 +18,7 @@ function FileManager(dialogDom) {
|
| this.filesystem_ = null;
|
| this.params_ = location.search ?
|
| JSON.parse(decodeURIComponent(location.search.substr(1))) :
|
| - {};
|
| + window.launchData || {};
|
| this.listType_ = null;
|
| this.showDelayTimeout_ = null;
|
|
|
| @@ -818,7 +818,7 @@ DialogType.isModal = function(type) {
|
|
|
| this.textSearchState_ = {text: '', date: new Date()};
|
|
|
| - this.closeOnUnmount_ = this.params_.mountTriggered;
|
| + this.closeOnUnmount_ = (this.params_.action == 'auto-open');
|
|
|
| if (this.closeOnUnmount_) {
|
| this.volumeManager_.addEventListener('externally-unmounted',
|
| @@ -1273,9 +1273,8 @@ DialogType.isModal = function(type) {
|
| // In the FULL_PAGE mode if the hash path points to a file we might have
|
| // to invoke a task after selecting it.
|
| // If the file path is in params_ we only want to select the file.
|
| - var invokeHandlers = pageLoading && !this.params_.selectOnly &&
|
| - this.dialogType == DialogType.FULL_PAGE &&
|
| - !!location.hash;
|
| + var invokeHandlers = pageLoading && (this.params_.action != 'select') &&
|
| + this.dialogType == DialogType.FULL_PAGE;
|
|
|
| if (PathUtil.getRootType(path) === RootType.GDATA) {
|
| var tracker = this.directoryModel_.createDirectoryChangeTracker();
|
|
|