Index: chrome/chrome_browser.gypi |
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi |
index 647f0d36db20bb183357ca8381062881f203ee45..e76f85dbd4caecf4c794059723c12dac0e823e3c 100644 |
--- a/chrome/chrome_browser.gypi |
+++ b/chrome/chrome_browser.gypi |
@@ -2449,8 +2449,6 @@ |
'browser/service_process/service_process_control.cc', |
'browser/service_process/service_process_control.h', |
'browser/service_process/service_process_control_mac.mm', |
- 'browser/task_manager/printing_information.cc', |
- 'browser/task_manager/printing_information.h', |
], |
'chrome_browser_profiles_sources': [ |
'browser/profiles/avatar_menu_actions.h', |
@@ -2989,11 +2987,6 @@ |
'browser/sync/sync_sessions_metrics_android.h', |
], |
'chrome_browser_task_manager_sources': [ |
- # Stats collection for CAPS (uses old task manager): |
- 'browser/caps/generate_state_json.cc', |
- 'browser/caps/generate_state_json.h', |
- |
- # New Task Manager Sources: |
'browser/task_management/providers/browser_process_task.cc', |
'browser/task_management/providers/browser_process_task.h', |
'browser/task_management/providers/browser_process_task_provider.cc', |
@@ -3063,8 +3056,9 @@ |
'browser/task_management/task_manager_interface.h', |
'browser/task_management/task_manager_observer.cc', |
'browser/task_management/task_manager_observer.h', |
- |
- # Old Task Manager Sources: |
+ ], |
+ 'chrome_browser_old_task_manager_mac_sources': [ |
tapted
2016/04/26 01:54:04
_mac_sources -> _cocoa_sources
afakhry
2016/04/26 22:22:43
Done.
|
+ # Old Task Manager Sources enabled only on mac: |
tapted
2016/04/26 01:54:04
.. enabled only for the Mac Cocoa UI.
afakhry
2016/04/26 22:22:43
Done.
|
'browser/task_manager/background_information.cc', |
'browser/task_manager/background_information.h', |
'browser/task_manager/browser_process_resource_provider.cc', |
@@ -3077,6 +3071,8 @@ |
'browser/task_manager/guest_information.h', |
'browser/task_manager/panel_information.cc', |
'browser/task_manager/panel_information.h', |
+ 'browser/task_manager/printing_information.cc', |
+ 'browser/task_manager/printing_information.h', |
'browser/task_manager/renderer_resource.cc', |
'browser/task_manager/renderer_resource.h', |
'browser/task_manager/resource_provider.cc', |
@@ -3507,6 +3503,11 @@ |
['chromeos==1', { |
'sources': [ '<@(chrome_browser_task_manager_chromeos_sources)' ], |
}], |
+ ['OS=="mac"', { |
tapted
2016/04/26 01:54:03
'OS=="mac"' -> 'OS=="mac"' and mac_views_browser==
afakhry
2016/04/26 22:22:43
I'm confused now. Do we want to exclude this at co
tapted
2016/04/26 22:43:50
so the "old" task manager stuff is only needed for
|
+ 'sources': [ |
+ '<@(chrome_browser_old_task_manager_mac_sources)' |
+ ], |
+ }], |
], |
}], |
['enable_media_router==1', { |