| Index: ui/ui.gyp
|
| diff --git a/ui/ui.gyp b/ui/ui.gyp
|
| index ed5b79aeb481a2928d0ace6e2d9cbe66d2b9da36..478ff6fafb35f5d6f38e0cc1dcbc6376f5c114ca 100644
|
| --- a/ui/ui.gyp
|
| +++ b/ui/ui.gyp
|
| @@ -212,6 +212,18 @@
|
| 'base/models/tree_model.h',
|
| 'base/models/tree_node_iterator.h',
|
| 'base/models/tree_node_model.h',
|
| + 'base/native_theme/native_theme.cc',
|
| + 'base/native_theme/native_theme.h',
|
| + 'base/native_theme/native_theme_android.cc',
|
| + 'base/native_theme/native_theme_android.h',
|
| + 'base/native_theme/native_theme_aura.cc',
|
| + 'base/native_theme/native_theme_aura.h',
|
| + 'base/native_theme/native_theme_base.cc',
|
| + 'base/native_theme/native_theme_base.h',
|
| + 'base/native_theme/native_theme_gtk.cc',
|
| + 'base/native_theme/native_theme_gtk.h',
|
| + 'base/native_theme/native_theme_win.cc',
|
| + 'base/native_theme/native_theme_win.h',
|
| 'base/range/range.cc',
|
| 'base/range/range.h',
|
| 'base/range/range_mac.mm',
|
| @@ -332,18 +344,6 @@
|
| 'gfx/mac/scoped_ns_disable_screen_updates.h',
|
| 'gfx/monitor.cc',
|
| 'gfx/monitor.h',
|
| - 'gfx/native_theme.cc',
|
| - 'gfx/native_theme.h',
|
| - 'gfx/native_theme_android.cc',
|
| - 'gfx/native_theme_android.h',
|
| - 'gfx/native_theme_aura.cc',
|
| - 'gfx/native_theme_aura.h',
|
| - 'gfx/native_theme_base.cc',
|
| - 'gfx/native_theme_base.h',
|
| - 'gfx/native_theme_gtk.cc',
|
| - 'gfx/native_theme_gtk.h',
|
| - 'gfx/native_theme_win.cc',
|
| - 'gfx/native_theme_win.h',
|
| 'gfx/native_widget_types.h',
|
| 'gfx/pango_util.h',
|
| 'gfx/pango_util.cc',
|
| @@ -452,20 +452,20 @@
|
| ],
|
| }, { # use_aura!=1
|
| 'sources!': [
|
| - 'gfx/native_theme_aura.cc',
|
| - 'gfx/native_theme_aura.h',
|
| 'base/cursor/cursor.cc',
|
| 'base/cursor/cursor.h',
|
| 'base/cursor/cursor_win.cc',
|
| 'base/cursor/cursor_x11.cc',
|
| + 'base/native_theme/native_theme_aura.cc',
|
| + 'base/native_theme/native_theme_aura.h',
|
| ]
|
| }],
|
| ['use_aura==1 and OS=="win"', {
|
| 'sources/': [
|
| ['exclude', 'base/dragdrop/os_exchange_data_provider_win.cc'],
|
| ['exclude', 'base/dragdrop/os_exchange_data_provider_win.h'],
|
| - ['exclude', 'gfx/native_theme_win.cc'],
|
| - ['exclude', 'gfx/native_theme_win.h'],
|
| + ['exclude', 'base/native_theme/native_theme_win.cc'],
|
| + ['exclude', 'base/native_theme/native_theme_win.h'],
|
| ['exclude', 'gfx/path_win.cc'],
|
| ],
|
| }],
|
| @@ -534,8 +534,8 @@
|
| ],
|
| }, { # toolkit_uses_gtk != 1
|
| 'sources!': [
|
| - 'gfx/native_theme_gtk.cc',
|
| - 'gfx/native_theme_gtk.h',
|
| + 'base/native_theme/native_theme_gtk.cc',
|
| + 'base/native_theme/native_theme_gtk.h',
|
| ]
|
| }],
|
| ['OS=="win"', {
|
| @@ -544,8 +544,8 @@
|
| 'gfx/gdi_util.h',
|
| 'gfx/icon_util.cc',
|
| 'gfx/icon_util.h',
|
| - 'gfx/native_theme_win.cc',
|
| - 'gfx/native_theme_win.h',
|
| + 'base/native_theme/native_theme_win.cc',
|
| + 'base/native_theme/native_theme_win.h',
|
| ],
|
| 'sources!': [
|
| 'base/touch/touch_factory.cc',
|
| @@ -594,8 +594,8 @@
|
| 'base/dragdrop/drop_target.cc',
|
| 'base/dragdrop/drop_target.h',
|
| 'base/dragdrop/os_exchange_data.cc',
|
| - 'gfx/native_theme_win.cc',
|
| - 'gfx/native_theme_win.h',
|
| + 'base/native_theme/native_theme_win.cc',
|
| + 'base/native_theme/native_theme_win.h',
|
| ],
|
| 'sources/': [
|
| ['exclude', '^base/win/*'],
|
|
|