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

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

Issue 22165002: Change the meaning of SelectFileDialog.support_drive: it means Drive-aware callers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review fix (#2). Created 7 years, 4 months 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
« no previous file with comments | « chrome/browser/file_select_helper.cc ('k') | chrome/browser/ui/certificate_dialogs.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 42653869d05ab561f9ddda424e4e0f277c5bedc2..f881e78e42a018f4737ba0416f3fa804bbbe426d 100644
--- a/chrome/browser/resources/file_manager/js/file_manager.js
+++ b/chrome/browser/resources/file_manager/js/file_manager.js
@@ -2010,11 +2010,16 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
};
FileManager.prototype.isDriveEnabled = function() {
- // TODO(kinaba): Remove the "!shouldReturnLocalPath &&" condition once
- // crbug.com/140425 is done.
- return !this.params_.shouldReturnLocalPath &&
- (!('driveEnabled' in this.preferences_) ||
- this.preferences_.driveEnabled);
+ // Auto resolving to local path does not work for folders (e.g., dialog for
+ // loading unpacked extensions) and saving.
+ // TODO(kinaba): make it work for the save dialog http://crbug.com/140425
+ var noLocalPathResolution =
+ this.params_.type == DialogType.SELECT_SAVEAS_FILE ||
+ this.params_.type == DialogType.SELECT_FOLDER ||
+ this.params_.type == DialogType.SELECT_UPLOAD_FOLDER;
+ if (noLocalPathResolution && this.params_.shouldReturnLocalPath)
+ return false;
+ return this.preferences_.driveEnabled;
};
FileManager.prototype.isOnReadonlyDirectory = function() {
« no previous file with comments | « chrome/browser/file_select_helper.cc ('k') | chrome/browser/ui/certificate_dialogs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698