| Index: chrome/chrome_tests_unit.gypi
|
| diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
|
| index 4514f23c03a6eb3cf33653f33304e7a358cf1928..831038e3b4477cc8ff6160ee07d1f29404fd98e2 100644
|
| --- a/chrome/chrome_tests_unit.gypi
|
| +++ b/chrome/chrome_tests_unit.gypi
|
| @@ -1350,13 +1350,20 @@
|
| 'browser/profiles/profile_list_desktop_unittest.cc',
|
| 'browser/shell_integration_linux_unittest.cc',
|
| ],
|
| + # Cross-platform views unit tests ready for toolkit-views on Mac.
|
| + # TODO(tapted): Enable toolkit-views unit_tests on Mac when their
|
| + # respective implementations are linked in. http://crbug.com/412234.
|
| 'chrome_unit_tests_views_sources': [
|
| + 'browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc',
|
| + 'browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc',
|
| + ],
|
| + # Cross-platform (except Mac) views unit tests. Assumes app list is enabled.
|
| + 'chrome_unit_tests_views_non_mac_sources': [
|
| 'browser/ui/views/accelerator_table_unittest.cc',
|
| # Views implies app list is enabled (only disabled on mobile).
|
| 'browser/ui/views/app_list/linux/app_list_linux_unittest.cc',
|
| 'browser/ui/views/app_list/win/app_list_win_unittest.cc',
|
| - 'browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc',
|
| - 'browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc',
|
| + 'browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc',
|
| 'browser/ui/views/apps/shaped_app_window_targeter_unittest.cc',
|
| 'browser/ui/views/autofill/autofill_dialog_views_unittest.cc',
|
| 'browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc',
|
| @@ -2630,11 +2637,10 @@
|
| '../ui/views/views.gyp:views',
|
| '../ui/views/views.gyp:views_test_support',
|
| ],
|
| + 'sources': [ '<@(chrome_unit_tests_views_sources)' ],
|
| 'conditions': [
|
| - # TODO(tapted): Enable toolkit-views unit_tests on Mac when their
|
| - # respective implementations are linked in. http://crbug.com/412234.
|
| ['OS != "mac"', {
|
| - 'sources': [ '<@(chrome_unit_tests_views_sources)' ],
|
| + 'sources': [ '<@(chrome_unit_tests_views_non_mac_sources)' ],
|
| }],
|
| ],
|
| }],
|
|
|