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

Unified Diff: chrome/chrome_tests_unit.gypi

Issue 1951783002: Remove --enable-mac-views-app-list on Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix gn on not mac Created 4 years, 7 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
Index: chrome/chrome_tests_unit.gypi
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 0afbe91e36989bd5f80be4a05e808e91ba2860c9..d83f6ba9d6467f5eefb925069bd23ed62cf194d2 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -2750,9 +2750,17 @@
'dependencies': [
'../ui/app_list/app_list.gyp:app_list_test_support',
],
- }],
- ['enable_app_list==1 and chromeos==1', {
- 'sources': [ '<@(chrome_unit_tests_app_list_chromeos_sources)' ],
+ 'conditions': [
+ ['chromeos==1', {
+ 'sources': [ '<@(chrome_unit_tests_app_list_chromeos_sources)' ],
+ }],
+ ['OS=="mac"', {
+ 'sources!': [
+ # This assumes the AppList is views-based.
msw 2016/05/05 01:51:07 nit: "and Mac uses Cocoa"?
tapted 2016/05/05 02:53:42 yep added "but Mac only links browser parts for th
+ 'browser/ui/app_list/app_list_shower_views_unittest.cc',
+ ],
+ }],
+ ],
}],
['enable_app_list==1 and chromeos==1', {
msw 2016/05/05 01:51:07 optional nit: merge this with your nested chromeos
tapted 2016/05/05 02:53:42 Hum - I guess this was from a time when there was
'sources': [ '<@(chrome_unit_tests_app_list_chromeos_arc_sources)' ],

Powered by Google App Engine
This is Rietveld 408576698