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

Unified Diff: chrome/chrome_tests.gypi

Issue 1912773002: Remove the old task manager view (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: thestig's comments Created 4 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
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index de3b405311dd765d5b69f50503ce0cdcc02470dc..e1ad188c699c61c4048bbbf18a92c2bd8c458d11 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -451,9 +451,6 @@
'browser/task_management/providers/web_contents/extension_tag_browsertest.cc',
'browser/task_management/providers/web_contents/subframe_task_browsertest.cc',
'browser/task_management/providers/web_contents/tab_contents_tag_browsertest.cc',
- 'browser/task_manager/task_manager_browsertest.cc',
- 'browser/task_manager/task_manager_browsertest_util.cc',
- 'browser/task_manager/task_manager_browsertest_util.h',
'browser/themes/theme_service_browsertest.cc',
'browser/tracing/chrome_tracing_delegate_browsertest.cc',
'browser/translate/cld_data_harness.cc',
@@ -603,6 +600,11 @@
'test/ppapi/ppapi_browsertest.cc',
'test/ppapi/ppapi_filechooser_browsertest.cc',
],
+ 'chrome_browser_tests_old_task_manager_mac_sources': [
+ 'browser/task_manager/task_manager_browsertest.cc',
tapted 2016/04/26 01:54:04 These should go in chrome_browser_tests_cocoa_sour
afakhry 2016/04/26 22:22:43 Done.
+ 'browser/task_manager/task_manager_browsertest_util.cc',
+ 'browser/task_manager/task_manager_browsertest_util.h',
+ ],
# Tests corresponding to the files in chrome_browser_ui_cocoa_sources.
# Built on Mac, except when mac_views_browser==1.
'chrome_browser_tests_cocoa_sources': [
@@ -1066,7 +1068,6 @@
'browser/renderer_context_menu/render_view_context_menu_browsertest_util.cc',
'browser/renderer_context_menu/render_view_context_menu_browsertest_util.h',
'browser/site_per_process_interactive_browsertest.cc',
- 'browser/task_manager/task_manager_browsertest_util.cc',
'browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc',
'browser/ui/browser_focus_uitest.cc',
'browser/ui/cocoa/apps/app_shim_menu_controller_mac_interactive_uitest.mm',
@@ -1706,6 +1707,12 @@
'../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
],
}],
+ ['OS == "mac"', {
+ 'sources': [
+ 'browser/task_manager/task_manager_browsertest_util.cc',
tapted 2016/04/26 01:54:04 these should be repeated in chrome_interactive_ui_
afakhry 2016/04/26 22:22:43 Done.
+ 'browser/task_manager/task_manager_browsertest_util.h',
+ ],
+ }],
['OS=="linux"', {
'dependencies': [
'../build/linux/system.gyp:ssl',
@@ -2292,7 +2299,12 @@
'browser/ui/views/ime/ime_window_browsertest.cc',
],
}]
- ]
+ ]}
+ ],
+ ['OS == "mac"', {
+ 'sources': [
+ '<@(chrome_browser_tests_old_task_manager_mac_sources)',
+ ],
}],
['enable_wifi_display==1', {
'sources': [

Powered by Google App Engine
This is Rietveld 408576698