summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webdropdata.cc
diff options
context:
space:
mode:
authordcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-05 03:14:12 +0000
committerdcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-05 03:14:12 +0000
commit2d04fb5283f7ce8a55810e26582372d396d16fa8 (patch)
tree950675a584e7c8d0115a696fe1ff0f2cd8b7d559 /webkit/glue/webdropdata.cc
parent88e03fa16a2ed1a178822d4ba46dd96a276815a4 (diff)
downloadchromium_src-2d04fb5283f7ce8a55810e26582372d396d16fa8.zip
chromium_src-2d04fb5283f7ce8a55810e26582372d396d16fa8.tar.gz
chromium_src-2d04fb5283f7ce8a55810e26582372d396d16fa8.tar.bz2
Update Chrome to use the renamed WebDragData methods.
BUG=none TEST=none Review URL: http://codereview.chromium.org/3526017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61472 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webdropdata.cc')
-rw-r--r--webkit/glue/webdropdata.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/webkit/glue/webdropdata.cc b/webkit/glue/webdropdata.cc
index ea9e6c6..cda887d 100644
--- a/webkit/glue/webdropdata.cc
+++ b/webkit/glue/webdropdata.cc
@@ -28,12 +28,12 @@ WebDropData::WebDropData(const WebDragData& drag_data)
plain_text(drag_data.plainText()),
text_html(drag_data.htmlText()),
html_base_url(drag_data.htmlBaseURL()),
- file_description_filename(drag_data.fileContentFileName()) {
- if (drag_data.hasFileNames()) {
- WebVector<WebString> fileNames;
- drag_data.fileNames(fileNames);
- for (size_t i = 0; i < fileNames.size(); ++i)
- filenames.push_back(fileNames[i]);
+ file_description_filename(drag_data.fileContentFilename()) {
+ if (drag_data.containsFilenames()) {
+ WebVector<WebString> filenames_copy;
+ drag_data.filenames(filenames_copy);
+ for (size_t i = 0; i < filenames_copy.size(); ++i)
+ filenames.push_back(filenames_copy[i]);
}
WebData contents = drag_data.fileContent();
if (!contents.isEmpty())
@@ -53,11 +53,11 @@ WebDragData WebDropData::ToDragData() const {
result.setURL(url);
result.setURLTitle(url_title);
result.setFileExtension(file_extension);
- result.setFileNames(filenames);
+ result.setFilenames(filenames);
result.setPlainText(plain_text);
result.setHTMLText(text_html);
result.setHTMLBaseURL(html_base_url);
- result.setFileContentFileName(file_description_filename);
+ result.setFileContentFilename(file_description_filename);
result.setFileContent(WebData(file_contents.data(), file_contents.size()));
return result;
}