diff options
| author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 00:18:04 +0000 |
|---|---|---|
| committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 00:18:04 +0000 |
| commit | b518852c1a1ccf23fd3ee12d49895009cb8a5aa0 (patch) | |
| tree | 09747b8108c0baa5519b65ddcffc6db37743b1f7 /content/renderer | |
| parent | 520c202f47822bb9e812a552c8672fc3c7182103 (diff) | |
| download | chromium_src-b518852c1a1ccf23fd3ee12d49895009cb8a5aa0.zip chromium_src-b518852c1a1ccf23fd3ee12d49895009cb8a5aa0.tar.gz chromium_src-b518852c1a1ccf23fd3ee12d49895009cb8a5aa0.tar.bz2 | |
gdata: Pass display names to to the file chooser listener.
The display names are used for showing the file names in web pages,
and for uploading.
BUG=chromium-os:27222
TEST=manually confirm that file selection on chrome os works, the files are displayed and uploaded properly.
Review URL: https://chromiumcodereview.appspot.com/9700009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126798 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/render_view_impl.cc | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index d3ca701..525cec2 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -4153,13 +4153,20 @@ void RenderViewImpl::OnFileChooserResponse( if (file_chooser_completions_.empty()) return; - WebVector<WebString> ws_file_names(files.size()); - for (size_t i = 0; i < files.size(); ++i) - ws_file_names[i] = webkit_glue::FilePathToWebString(files[i].path); + // Convert Chrome's SelectedFileInfo list to WebKit's. + WebVector<WebFileChooserCompletion::SelectedFileInfo> selected_files( + files.size()); + for (size_t i = 0; i < files.size(); ++i) { + WebFileChooserCompletion::SelectedFileInfo selected_file; + selected_file.path = webkit_glue::FilePathToWebString(files[i].path); + selected_file.displayName = webkit_glue::FilePathStringToWebString( + files[i].display_name); + selected_files[i] = selected_file; + } - // TODO(satorux,kinuko): Pass display names too. crosbug.com/27222 if (file_chooser_completions_.front()->completion) - file_chooser_completions_.front()->completion->didChooseFile(ws_file_names); + file_chooser_completions_.front()->completion->didChooseFile( + selected_files); file_chooser_completions_.pop_front(); // If there are more pending file chooser requests, schedule one now. |