diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-08 00:39:05 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-08 00:39:05 +0000 |
| commit | deafa3ec97696cdcfd3cf0154b373952ab5be9a2 (patch) | |
| tree | 5d2d8a367f6c2412b2ee26abfc4d4ab008412b93 /ui/views/controls | |
| parent | b9e2fe5f07bded6e20102f718715d9eaacdab9a3 (diff) | |
| download | chromium_src-deafa3ec97696cdcfd3cf0154b373952ab5be9a2.zip chromium_src-deafa3ec97696cdcfd3cf0154b373952ab5be9a2.tar.gz chromium_src-deafa3ec97696cdcfd3cf0154b373952ab5be9a2.tar.bz2 | |
Get drag and drop working for win aura.
This makes a bunch of bookmark interactive tests pass.
BUG=154081
Review URL: https://codereview.chromium.org/11444013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171898 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/controls')
| -rw-r--r-- | ui/views/controls/textfield/native_textfield_views_unittest.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ui/views/controls/textfield/native_textfield_views_unittest.cc b/ui/views/controls/textfield/native_textfield_views_unittest.cc index e599e7c..91ee81f 100644 --- a/ui/views/controls/textfield/native_textfield_views_unittest.cc +++ b/ui/views/controls/textfield/native_textfield_views_unittest.cc @@ -873,11 +873,7 @@ TEST_F(NativeTextfieldViewsTest, DragAndDrop_AcceptDrop) { ui::OSExchangeData bad_data; bad_data.SetFilename(FilePath(FILE_PATH_LITERAL("x"))); #if defined(OS_WIN) -#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")); |