Commit 489a9778 authored by avi's avatar avi Committed by Commit bot

Disable package selection for multiple-selection file dialogs.

(This is a stopgap until the zipping mentioned in the bug can happen.)

BUG=33920
TEST=<input type=file multiple />, ensure packages can't be selected

Review URL: https://codereview.chromium.org/612143002

Cr-Commit-Position: refs/heads/master@{#297266}
parent 7352c303
...@@ -52,7 +52,7 @@ class SelectFileDialogImpl; ...@@ -52,7 +52,7 @@ class SelectFileDialogImpl;
parentWindow:(NSWindow*)parentWindow; parentWindow:(NSWindow*)parentWindow;
// NSSavePanel delegate method // NSSavePanel delegate method
- (BOOL)panel:(id)sender shouldShowFilename:(NSString *)filename; - (BOOL)panel:(id)sender shouldEnableURL:(NSURL *)url;
@end @end
...@@ -161,8 +161,9 @@ void SelectFileDialogImpl::FileWasSelected( ...@@ -161,8 +161,9 @@ void SelectFileDialogImpl::FileWasSelected(
bool SelectFileDialogImpl::ShouldEnableFilename(NSSavePanel* dialog, bool SelectFileDialogImpl::ShouldEnableFilename(NSSavePanel* dialog,
NSString* filename) { NSString* filename) {
// If this is a single open file dialog, disable selecting packages. // If this is a single/multiple open file dialog, disable selecting packages.
if (type_map_[dialog] != SELECT_OPEN_FILE) if (type_map_[dialog] != SELECT_OPEN_FILE &&
type_map_[dialog] != SELECT_OPEN_MULTI_FILE)
return true; return true;
return ![[NSWorkspace sharedWorkspace] isFilePackageAtPath:filename]; return ![[NSWorkspace sharedWorkspace] isFilePackageAtPath:filename];
...@@ -425,8 +426,10 @@ bool SelectFileDialogImpl::HasMultipleFileTypeChoicesImpl() { ...@@ -425,8 +426,10 @@ bool SelectFileDialogImpl::HasMultipleFileTypeChoicesImpl() {
[panel release]; [panel release];
} }
- (BOOL)panel:(id)sender shouldShowFilename:(NSString *)filename { - (BOOL)panel:(id)sender shouldEnableURL:(NSURL *)url {
return selectFileDialogImpl_->ShouldEnableFilename(sender, filename); if (![url isFileURL])
return NO;
return selectFileDialogImpl_->ShouldEnableFilename(sender, [url path]);
} }
@end @end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment