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

Unified Diff: chrome/browser/file_select_helper.cc

Issue 10414085: Modified the pepper file chooser API to support filtering files by extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 7 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.h ('k') | chrome/browser/file_select_helper_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/file_select_helper.cc
diff --git a/chrome/browser/file_select_helper.cc b/chrome/browser/file_select_helper.cc
index 4b328fc7c062b7cb832e2f8bb963e976fb9dad24..591f725fa065d0454e34361d1d87fbd39782aadd 100644
--- a/chrome/browser/file_select_helper.cc
+++ b/chrome/browser/file_select_helper.cc
@@ -249,30 +249,31 @@ SelectFileDialog::FileTypeInfo* FileSelectHelper::GetFileTypesFromAcceptType(
file_type->extensions.resize(1);
std::vector<FilePath::StringType>* extensions = &file_type->extensions.back();
- // Find the correspondinge extensions.
+ // Find the corresponding extensions.
int valid_type_count = 0;
int description_id = 0;
for (size_t i = 0; i < accept_types.size(); ++i) {
- std::string ascii_mime_type = UTF16ToASCII(accept_types[i]);
- // WebKit normalizes MIME types. See HTMLInputElement::acceptMIMETypes().
- DCHECK(StringToLowerASCII(ascii_mime_type) == ascii_mime_type)
- << "A MIME type contains uppercase letter: " << ascii_mime_type;
- DCHECK(TrimWhitespaceASCII(ascii_mime_type, TRIM_ALL, &ascii_mime_type)
- == TRIM_NONE)
- << "A MIME type contains whitespace: '" << ascii_mime_type << "'";
+ std::string ascii_type = UTF16ToASCII(accept_types[i]);
+ if (!IsAcceptTypeValid(ascii_type))
+ continue;
size_t old_extension_size = extensions->size();
- if (ascii_mime_type == "image/*") {
+ if (ascii_type[0] == '.') {
+ // If the type starts with a period it is assumed to be a file extension
+ // so we just have to add it to the list.
+ FilePath::StringType ext(ascii_type.begin(), ascii_type.end());
+ extensions->push_back(ext.substr(1));
+ } else if (ascii_type == "image/*") {
description_id = IDS_IMAGE_FILES;
net::GetImageExtensions(extensions);
- } else if (ascii_mime_type == "audio/*") {
+ } else if (ascii_type == "audio/*") {
description_id = IDS_AUDIO_FILES;
net::GetAudioExtensions(extensions);
- } else if (ascii_mime_type == "video/*") {
+ } else if (ascii_type == "video/*") {
description_id = IDS_VIDEO_FILES;
net::GetVideoExtensions(extensions);
} else {
- net::GetExtensionsForMimeType(ascii_mime_type, extensions);
+ net::GetExtensionsForMimeType(ascii_type, extensions);
}
if (extensions->size() > old_extension_size)
@@ -461,3 +462,17 @@ void FileSelectHelper::Observe(int type,
NOTREACHED();
}
}
+
+// static
+bool FileSelectHelper::IsAcceptTypeValid(const std::string& accept_type) {
+ // TODO(raymes): This only does some basic checks, extend to test more cases.
+ // A 1 character accept type will always be invalid (either a "." in the case
+ // of an extension or a "/" in the case of a MIME type).
+ std::string unused;
+ if (accept_type.length() <= 1 ||
+ StringToLowerASCII(accept_type) != accept_type ||
+ TrimWhitespaceASCII(accept_type, TRIM_ALL, &unused) != TRIM_NONE) {
+ return false;
+ }
+ return true;
+}
« no previous file with comments | « chrome/browser/file_select_helper.h ('k') | chrome/browser/file_select_helper_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698