| Index: chrome/chrome_browser.gypi
|
| diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
|
| index c227c35e6e76fdf8faa984b58898e7359173592b..d9d13703b8ecb0c52301007e76f730fdad8700a2 100644
|
| --- a/chrome/chrome_browser.gypi
|
| +++ b/chrome/chrome_browser.gypi
|
| @@ -2455,8 +2455,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',
|
| @@ -2995,11 +2993,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',
|
| @@ -3069,8 +3062,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_cocoa_sources': [
|
| + # Old Task Manager Sources enabled only for the Mac Cocoa UI:
|
| 'browser/task_manager/background_information.cc',
|
| 'browser/task_manager/background_information.h',
|
| 'browser/task_manager/browser_process_resource_provider.cc',
|
| @@ -3083,6 +3077,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',
|
| @@ -3513,6 +3509,11 @@
|
| ['chromeos==1', {
|
| 'sources': [ '<@(chrome_browser_task_manager_chromeos_sources)' ],
|
| }],
|
| + ['OS=="mac" and mac_views_browser==0', {
|
| + 'sources': [
|
| + '<@(chrome_browser_old_task_manager_cocoa_sources)'
|
| + ],
|
| + }],
|
| ],
|
| }],
|
| ['enable_media_router==1', {
|
|
|