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

Side by Side Diff: Source/web/WebFileChooserCompletionImpl.cpp

Issue 640723006: Pass the selected non-native file information from the browser to FileInputType. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 12 matching lines...) Expand all
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "web/WebFileChooserCompletionImpl.h" 32 #include "web/WebFileChooserCompletionImpl.h"
33 #include "platform/FileMetadata.h"
33 34
34 namespace blink { 35 namespace blink {
35 36
36 WebFileChooserCompletionImpl::WebFileChooserCompletionImpl(PassRefPtr<FileChoose r> chooser) 37 WebFileChooserCompletionImpl::WebFileChooserCompletionImpl(PassRefPtr<FileChoose r> chooser)
37 : m_fileChooser(chooser) 38 : m_fileChooser(chooser)
38 { 39 {
39 } 40 }
40 41
41 WebFileChooserCompletionImpl::~WebFileChooserCompletionImpl() 42 WebFileChooserCompletionImpl::~WebFileChooserCompletionImpl()
42 { 43 {
43 } 44 }
44 45
45 void WebFileChooserCompletionImpl::didChooseFile(const WebVector<WebString>& fil eNames) 46 void WebFileChooserCompletionImpl::didChooseFile(const WebVector<WebString>& fil eNames)
46 { 47 {
47 Vector<FileChooserFileInfo> fileInfo; 48 Vector<FileChooserFileInfo> fileInfo;
48 for (size_t i = 0; i < fileNames.size(); ++i) 49 for (size_t i = 0; i < fileNames.size(); ++i)
49 fileInfo.append(FileChooserFileInfo(fileNames[i])); 50 fileInfo.append(FileChooserFileInfo(fileNames[i]));
50 m_fileChooser->chooseFiles(fileInfo); 51 m_fileChooser->chooseFiles(fileInfo);
51 // This object is no longer needed. 52 // This object is no longer needed.
52 delete this; 53 delete this;
53 } 54 }
54 55
55 void WebFileChooserCompletionImpl::didChooseFile(const WebVector<SelectedFileInf o>& files) 56 void WebFileChooserCompletionImpl::didChooseFile(const WebVector<SelectedFileInf o>& files)
56 { 57 {
57 Vector<FileChooserFileInfo> fileInfo; 58 Vector<FileChooserFileInfo> fileInfo;
58 for (size_t i = 0; i < files.size(); ++i) 59 for (size_t i = 0; i < files.size(); ++i) {
59 fileInfo.append(FileChooserFileInfo(files[i].path, files[i].displayName) ); 60 if (files[i].fileSystemURL.isEmpty()) {
61 fileInfo.append(FileChooserFileInfo(files[i].path, files[i].displayN ame));
62 } else {
63 FileMetadata metadata;
64 metadata.modificationTime = files[i].modificationTime;
65 metadata.length = files[i].length;
66 metadata.type = files[i].isDirectory ? FileMetadata::TypeDirectory : FileMetadata::TypeFile;
67 fileInfo.append(FileChooserFileInfo(files[i].fileSystemURL, metadata ));
68 }
69 }
60 m_fileChooser->chooseFiles(fileInfo); 70 m_fileChooser->chooseFiles(fileInfo);
61 // This object is no longer needed. 71 // This object is no longer needed.
62 delete this; 72 delete this;
63 } 73 }
64 74
65 } // namespace blink 75 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698