diff options
| author | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-24 02:42:22 +0000 |
|---|---|---|
| committer | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-24 02:42:22 +0000 |
| commit | 2c718a0de2fe3489b742ac091435878f1890621c (patch) | |
| tree | 50c134a0b0146ca11cbadcb55fba5e791d6c999d /chrome/browser/file_select_helper.cc | |
| parent | 90f62f09472e09817ec52ed2ab821b18a5cabdf3 (diff) | |
| download | chromium_src-2c718a0de2fe3489b742ac091435878f1890621c.zip chromium_src-2c718a0de2fe3489b742ac091435878f1890621c.tar.gz chromium_src-2c718a0de2fe3489b742ac091435878f1890621c.tar.bz2 | |
Do not include directories to file lists
This change is essentially a revert of https://codereview.chromium.org/6250118
BUG=353084
Review URL: https://codereview.chromium.org/206033002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258848 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/file_select_helper.cc')
| -rw-r--r-- | chrome/browser/file_select_helper.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chrome/browser/file_select_helper.cc b/chrome/browser/file_select_helper.cc index 423e885..e2cb494 100644 --- a/chrome/browser/file_select_helper.cc +++ b/chrome/browser/file_select_helper.cc @@ -199,13 +199,11 @@ void FileSelectHelper::OnListFile( const net::DirectoryLister::DirectoryListerData& data) { ActiveDirectoryEnumeration* entry = directory_enumerations_[id]; - // Directory upload returns directories via a "." file, so that - // empty directories are included. This util call just checks - // the flags in the structure; there's no file I/O going on. + // Directory upload only cares about files. if (data.info.IsDirectory()) - entry->results_.push_back(data.path.Append(FILE_PATH_LITERAL("."))); - else - entry->results_.push_back(data.path); + return; + + entry->results_.push_back(data.path); } void FileSelectHelper::OnListDone(int id, int error) { |