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

Unified Diff: ui/base/ui_base.gyp

Issue 248893002: MacViews: gyp changes for a non-aura toolkit views on mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase for r265571 conflict, less similarity Created 6 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/dragdrop/os_exchange_data_provider_mac.mm ('k') | ui/gfx/gfx.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ui_base.gyp
diff --git a/ui/base/ui_base.gyp b/ui/base/ui_base.gyp
index 3d9214f9c782f4e295a18e25c7c2617b61e4ed37..21090e469ffba497e61f297ebcef3e644ada50f6 100644
--- a/ui/base/ui_base.gyp
+++ b/ui/base/ui_base.gyp
@@ -153,6 +153,7 @@
'dragdrop/drag_utils.cc',
'dragdrop/drag_utils.h',
'dragdrop/drag_utils_aura.cc',
+ 'dragdrop/drag_utils_mac.mm',
'dragdrop/drag_utils_win.cc',
'dragdrop/drop_target_event.cc',
'dragdrop/drop_target_event.h',
@@ -166,6 +167,7 @@
'dragdrop/os_exchange_data_provider_aura.h',
'dragdrop/os_exchange_data_provider_aurax11.cc',
'dragdrop/os_exchange_data_provider_aurax11.h',
+ 'dragdrop/os_exchange_data_provider_mac.mm',
'dragdrop/os_exchange_data_provider_win.cc',
'dragdrop/os_exchange_data_provider_win.h',
'hit_test.h',
@@ -354,8 +356,6 @@
'cursor/cursor_mac.mm',
'cursor/cursor_win.cc',
'cursor/cursor_x11.cc',
- 'nine_image_painter_factory.cc',
- 'nine_image_painter_factory.h',
'x/selection_owner.cc',
'x/selection_owner.h',
'x/selection_requestor.cc',
@@ -388,14 +388,6 @@
'sources/': [
['exclude', '^dragdrop/drag_utils.cc'],
['exclude', '^dragdrop/drag_utils.h'],
- ['exclude', '^dragdrop/os_exchange_data.cc'],
- ['exclude', '^dragdrop/os_exchange_data.h'],
- ],
- }, {
- # Note: because of gyp predence rules this has to be defined as
- # 'sources/' rather than 'sources!'.
- 'sources/': [
- ['include', '^dragdrop/os_exchange_data.cc'],
],
}],
],
@@ -469,10 +461,6 @@
],
}],
],
- 'sources!': [
- 'dragdrop/drag_drop_types.h',
- 'dragdrop/os_exchange_data.cc',
- ],
}],
['OS=="mac"', {
'dependencies': [
@@ -506,8 +494,13 @@
}],
['toolkit_views==0', {
'sources!': [
+ 'dragdrop/drag_drop_types.h',
'dragdrop/drop_target_event.cc',
'dragdrop/drop_target_event.h',
+ 'dragdrop/os_exchange_data.cc',
+ 'dragdrop/os_exchange_data.h',
+ 'nine_image_painter_factory.cc',
+ 'nine_image_painter_factory.h',
],
}],
['OS=="android"', {
« no previous file with comments | « ui/base/dragdrop/os_exchange_data_provider_mac.mm ('k') | ui/gfx/gfx.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698