| OLD | NEW |
| 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 27 matching lines...) Expand all Loading... |
| 38 WebFileChooserCompletionImpl::WebFileChooserCompletionImpl( | 38 WebFileChooserCompletionImpl::WebFileChooserCompletionImpl( |
| 39 PassRefPtr<FileChooser> chooser) | 39 PassRefPtr<FileChooser> chooser) |
| 40 : m_fileChooser(chooser) {} | 40 : m_fileChooser(chooser) {} |
| 41 | 41 |
| 42 WebFileChooserCompletionImpl::~WebFileChooserCompletionImpl() {} | 42 WebFileChooserCompletionImpl::~WebFileChooserCompletionImpl() {} |
| 43 | 43 |
| 44 void WebFileChooserCompletionImpl::didChooseFile( | 44 void WebFileChooserCompletionImpl::didChooseFile( |
| 45 const WebVector<WebString>& fileNames) { | 45 const WebVector<WebString>& fileNames) { |
| 46 Vector<FileChooserFileInfo> fileInfo; | 46 Vector<FileChooserFileInfo> fileInfo; |
| 47 for (size_t i = 0; i < fileNames.size(); ++i) | 47 for (size_t i = 0; i < fileNames.size(); ++i) |
| 48 fileInfo.append(FileChooserFileInfo(fileNames[i])); | 48 fileInfo.push_back(FileChooserFileInfo(fileNames[i])); |
| 49 m_fileChooser->chooseFiles(fileInfo); | 49 m_fileChooser->chooseFiles(fileInfo); |
| 50 // This object is no longer needed. | 50 // This object is no longer needed. |
| 51 delete this; | 51 delete this; |
| 52 } | 52 } |
| 53 | 53 |
| 54 void WebFileChooserCompletionImpl::didChooseFile( | 54 void WebFileChooserCompletionImpl::didChooseFile( |
| 55 const WebVector<SelectedFileInfo>& files) { | 55 const WebVector<SelectedFileInfo>& files) { |
| 56 Vector<FileChooserFileInfo> fileInfo; | 56 Vector<FileChooserFileInfo> fileInfo; |
| 57 for (size_t i = 0; i < files.size(); ++i) { | 57 for (size_t i = 0; i < files.size(); ++i) { |
| 58 if (files[i].fileSystemURL.isEmpty()) { | 58 if (files[i].fileSystemURL.isEmpty()) { |
| 59 fileInfo.append(FileChooserFileInfo(files[i].path, files[i].displayName)); | 59 fileInfo.push_back( |
| 60 FileChooserFileInfo(files[i].path, files[i].displayName)); |
| 60 } else { | 61 } else { |
| 61 FileMetadata metadata; | 62 FileMetadata metadata; |
| 62 metadata.modificationTime = files[i].modificationTime * msPerSecond; | 63 metadata.modificationTime = files[i].modificationTime * msPerSecond; |
| 63 metadata.length = files[i].length; | 64 metadata.length = files[i].length; |
| 64 metadata.type = files[i].isDirectory ? FileMetadata::TypeDirectory | 65 metadata.type = files[i].isDirectory ? FileMetadata::TypeDirectory |
| 65 : FileMetadata::TypeFile; | 66 : FileMetadata::TypeFile; |
| 66 fileInfo.append(FileChooserFileInfo(files[i].fileSystemURL, metadata)); | 67 fileInfo.push_back(FileChooserFileInfo(files[i].fileSystemURL, metadata)); |
| 67 } | 68 } |
| 68 } | 69 } |
| 69 m_fileChooser->chooseFiles(fileInfo); | 70 m_fileChooser->chooseFiles(fileInfo); |
| 70 // This object is no longer needed. | 71 // This object is no longer needed. |
| 71 delete this; | 72 delete this; |
| 72 } | 73 } |
| 73 | 74 |
| 74 } // namespace blink | 75 } // namespace blink |
| OLD | NEW |