| Index: ui/base/ui_base.gyp
|
| diff --git a/ui/base/ui_base.gyp b/ui/base/ui_base.gyp
|
| index 7fa631c1a7da29e48d8d5c9378795f6abf47a4c8..d93e2006b3206c927242322d4767cf67425d005c 100644
|
| --- a/ui/base/ui_base.gyp
|
| +++ b/ui/base/ui_base.gyp
|
| @@ -152,6 +152,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',
|
| @@ -167,6 +168,8 @@
|
| '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.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',
|
| @@ -355,8 +358,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',
|
| @@ -365,6 +366,12 @@
|
| 'x/selection_utils.h',
|
| ]
|
| }],
|
| + ['use_aura==0 and OS!="mac"', {
|
| + 'sources!': [
|
| + 'nine_image_painter_factory.cc',
|
| + 'nine_image_painter_factory.h',
|
| + ],
|
| + }],
|
| ['use_aura==0 or OS!="linux"', {
|
| 'sources!': [
|
| 'resource/resource_bundle_auralinux.cc',
|
| @@ -384,7 +391,7 @@
|
| }],
|
| ['desktop_linux == 1 or chromeos == 1', {
|
| 'conditions': [
|
| - ['toolkit_views==0 and use_aura==0', {
|
| + ['toolkit_views==0 and use_aura==0 and os!="mac"', {
|
| # Note: because of gyp predence rules this has to be defined as
|
| # 'sources/' rather than 'sources!'.
|
| 'sources/': [
|
|
|