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

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: Remove duplicated symbol 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 08372c541c14cb9f8389486283c1f6ee2651ebf1..db995ca1a602ed6cc6fd7e3250fcd082669478d5 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_macosx_sources': [
+ 'browser/task_manager/task_manager_browsertest.cc',
+ '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',
@@ -1707,6 +1708,11 @@
'../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
],
}],
+ ['OS == "mac"', {
+ 'sources': [
+ 'browser/task_manager/task_manager_browsertest_util.cc',
Lei Zhang 2016/04/23 00:52:32 A bit weird to have this standalone. browser/task
afakhry 2016/04/25 20:02:50 browser/task_manager/task_manager_browsertest_util
+ ],
+ }],
['OS=="linux"', {
'dependencies': [
'../build/linux/system.gyp:ssl',
@@ -2281,11 +2287,11 @@
},
'conditions': [
['chromeos==1', {
- 'dependencies': [
- '../components/components.gyp:arc_test_support',
- '../third_party/boringssl/boringssl.gyp:boringssl',
- ]
- }, {
+ 'dependencies': [
Lei Zhang 2016/04/23 00:52:32 indentation is off
afakhry 2016/04/25 20:02:50 Done.
+ '../components/components.gyp:arc_test_support',
+ '../third_party/boringssl/boringssl.gyp:boringssl',
+ ]
+ }, {
'conditions': [
['OS == "linux" or OS == "win"', {
'sources': [
@@ -2293,7 +2299,12 @@
'browser/ui/views/ime/ime_window_browsertest.cc',
],
}]
- ]
+ ]}
+ ],
+ ['OS == "mac"', {
+ 'sources': [
+ '<@(chrome_browser_tests_old_task_manager_macosx_sources)',
+ ],
}],
['enable_wifi_display==1', {
'sources': [

Powered by Google App Engine
This is Rietveld 408576698