summaryrefslogtreecommitdiffstats
path: root/views/views.gyp
diff options
context:
space:
mode:
authorvarunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-17 05:18:16 +0000
committervarunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-17 05:18:16 +0000
commit084b6bb674002dddd9839248c3cc6b7d6c6dc4c7 (patch)
tree8ee9a95ca4e37a038f7f41468d16d18ea0b87850 /views/views.gyp
parent211921f6b78bd093aa181c57c09095c8732f567c (diff)
downloadchromium_src-084b6bb674002dddd9839248c3cc6b7d6c6dc4c7.zip
chromium_src-084b6bb674002dddd9839248c3cc6b7d6c6dc4c7.tar.gz
chromium_src-084b6bb674002dddd9839248c3cc6b7d6c6dc4c7.tar.bz2
First shot at implementing drag&drop for Aura
BUG=97845 TEST=none Review URL: http://codereview.chromium.org/8450018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110437 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/views.gyp')
-rw-r--r--views/views.gyp17
1 files changed, 5 insertions, 12 deletions
diff --git a/views/views.gyp b/views/views.gyp
index 6c63a8c..cc6dc38 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -256,6 +256,7 @@
'drag_controller.h',
'drag_utils.cc',
'drag_utils.h',
+ 'drag_utils_aura.cc',
'drag_utils_gtk.cc',
'drag_utils_linux.cc',
'drag_utils_win.cc',
@@ -437,6 +438,8 @@
['exclude', 'controls/menu/menu_2.*'],
],
'sources!': [
+ 'drag_utils_linux.cc',
+ 'drag_utils_win.cc',
'controls/menu/menu_config_linux.cc',
'controls/menu/menu_item_view_linux.cc',
'controls/menu/menu_separator_linux.cc',
@@ -462,18 +465,8 @@
'widget/child_window_message_processor.cc',
'widget/child_window_message_processor.h',
],
- 'conditions': [
- ['OS=="win"', {
- 'sources/': [
- ['include', 'drag_utils_win.cc'],
- ],
- }],
- ],
- }, { # else: use_aura==1
- 'sources!': [
- 'drag_utils_linux.cc',
- ]
- }],
+ },
+ ],
['toolkit_uses_gtk == 1', {
'dependencies': [
'../build/linux/system.gyp:gtk',