summaryrefslogtreecommitdiffstats
path: root/ui/ui.gyp
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-17 21:13:31 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-17 21:13:31 +0000
commit47975e5d7aea3a4e4c8f9c0ebfdc04ae61cb616b (patch)
tree778973e925219f8e731f9192ca6d64665fce9f68 /ui/ui.gyp
parent548ca51190ab172b863928fe2b1f6678a0c08502 (diff)
downloadchromium_src-47975e5d7aea3a4e4c8f9c0ebfdc04ae61cb616b.zip
chromium_src-47975e5d7aea3a4e4c8f9c0ebfdc04ae61cb616b.tar.gz
chromium_src-47975e5d7aea3a4e4c8f9c0ebfdc04ae61cb616b.tar.bz2
linux_aura: Implement dropping in chrome.
This patch makes dropping text and files onto the omnibox work in linux_aura builds of chrome. The parts that implement dragging out of chrome still don't work. BUG=130806 Review URL: https://codereview.chromium.org/14189002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194677 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/ui.gyp')
-rw-r--r--ui/ui.gyp9
1 files changed, 6 insertions, 3 deletions
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 17e98ac..122092c 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -128,6 +128,7 @@
'base/cursor/cursors_aura.h',
'base/dragdrop/cocoa_dnd_util.h',
'base/dragdrop/cocoa_dnd_util.mm',
+ 'base/dragdrop/desktop_selection_provider_aurax11.h',
'base/dragdrop/drag_drop_types.h',
'base/dragdrop/drag_drop_types_win.cc',
'base/dragdrop/drag_source_win.cc',
@@ -142,8 +143,10 @@
'base/dragdrop/gtk_dnd_util.h',
'base/dragdrop/os_exchange_data.cc',
'base/dragdrop/os_exchange_data.h',
- 'base/dragdrop/os_exchange_data_provider_aura.cc',
- 'base/dragdrop/os_exchange_data_provider_aura.h',
+ 'base/dragdrop/os_exchange_data_provider_aurax11.cc',
+ 'base/dragdrop/os_exchange_data_provider_aurax11.h',
+ 'base/dragdrop/os_exchange_data_provider_chromeos.cc',
+ 'base/dragdrop/os_exchange_data_provider_chromeos.h',
'base/dragdrop/os_exchange_data_provider_win.cc',
'base/dragdrop/os_exchange_data_provider_win.h',
'base/events/event.cc',
@@ -631,7 +634,6 @@
}],
['use_aura==1 and OS=="win"', {
'sources/': [
- ['exclude', 'base/dragdrop/os_exchange_data_provider_aura.cc'],
['exclude', 'base/dragdrop/drag_utils_aura.cc'],
],
}],
@@ -687,6 +689,7 @@
],
'sources!': [
'base/clipboard/clipboard_aurax11.cc',
+ 'base/dragdrop/os_exchange_data_provider_aurax11.cc',
'base/touch/touch_device.cc',
],
}],