diff options
| author | rbyers@chromium.org <rbyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-20 16:54:35 +0000 |
|---|---|---|
| committer | rbyers@chromium.org <rbyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-20 16:54:35 +0000 |
| commit | e22ac82caef5cca9248559392ac695c999036d42 (patch) | |
| tree | da1e0bb2d4d0b5e75cdeb03804b017544d6018d4 /ui/views | |
| parent | 294872a5102ab12dae3376f02feb0bbed09336ea (diff) | |
| download | chromium_src-e22ac82caef5cca9248559392ac695c999036d42.zip chromium_src-e22ac82caef5cca9248559392ac695c999036d42.tar.gz chromium_src-e22ac82caef5cca9248559392ac695c999036d42.tar.bz2 | |
Add drag and drop support for custom and html data types on Aura
Also unifies OSExchangeData::CustomFormat and Clipboard::FormatType on Aura so we don't need two separate code paths and mime type lists for getting specific custom formats.
BUG=118416
TEST=none yet
Review URL: http://codereview.chromium.org/9705072
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127706 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views')
| -rw-r--r-- | ui/views/controls/textfield/native_textfield_views_unittest.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ui/views/controls/textfield/native_textfield_views_unittest.cc b/ui/views/controls/textfield/native_textfield_views_unittest.cc index 37a7e6a..ed5e425 100644 --- a/ui/views/controls/textfield/native_textfield_views_unittest.cc +++ b/ui/views/controls/textfield/native_textfield_views_unittest.cc @@ -789,7 +789,12 @@ TEST_F(NativeTextfieldViewsTest, DragAndDrop_AcceptDrop) { ui::OSExchangeData bad_data; bad_data.SetFilename(FilePath(FILE_PATH_LITERAL("x"))); #if defined(OS_WIN) - bad_data.SetPickledData(CF_BITMAP, Pickle()); +#if defined(USE_AURA) + ui::OSExchangeData::CustomFormat fmt = ui::Clipboard::GetBitmapFormatType(); +#else + ui::OSExchangeData::CustomFormat fmt = CF_BITMAP; +#endif + bad_data.SetPickledData(fmt, Pickle()); bad_data.SetFileContents(FilePath(L"x"), "x"); bad_data.SetHtml(string16(ASCIIToUTF16("x")), GURL("x.org")); ui::OSExchangeData::DownloadFileInfo download(FilePath(), NULL); |