Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(194)

Unified Diff: chrome/browser/resources/file_manager/js/file_manager.js

Issue 11377054: Packaged Files app: open files from Downloads tab (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 233675f988232e5e05dd3a5237a095d9bd1fd7a3..1d3e7819debc30b84b58ab54904bd7690090af36 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;
@@ -817,7 +817,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',
@@ -1272,9 +1272,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();
« no previous file with comments | « chrome/browser/resources/file_manager/js/background.js ('k') | chrome/browser/resources/file_manager/js/file_tasks.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698