Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(267)

Unified Diff: ui/ui.gyp

Issue 14189002: linux_aura: Implement dropping in chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/x/x11_util.h ('k') | ui/views/controls/textfield/native_textfield_views_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ui.gyp
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 17e98ac8293db2cece71001e7f0ef12453e8190a..122092c457309ddc9a34497def92538fffd1da19 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',
],
}],
« no previous file with comments | « ui/base/x/x11_util.h ('k') | ui/views/controls/textfield/native_textfield_views_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698