Remove the old task manager view

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 9961514e81dee2b72d95c3e3321867a77c8e23f4..ace862f1445428f415cf1d5f1502da51c68a09a0 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2447,8 +2447,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',
@@ -2987,10 +2985,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:

[Lei Zhang, 2016/04/23 00:52:32]

not needed anymore?

[afakhry, 2016/04/25 20:02:50]

Done.

       'browser/task_management/providers/browser_process_task.cc',
       'browser/task_management/providers/browser_process_task.h',
@@ -3061,8 +3055,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_macosx_sources': [

[Lei Zhang, 2016/04/23 00:52:32]

nit: omit 'osx', ditto for other gypi files

[afakhry, 2016/04/25 20:02:50]

Done.

+      # Old Task Manager Sources enabled only on macosx:
       'browser/task_manager/background_information.cc',
       'browser/task_manager/background_information.h',
       'browser/task_manager/browser_process_resource_provider.cc',
@@ -3075,6 +3070,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',
@@ -3504,6 +3501,11 @@
           'conditions': [
             ['chromeos==1', {
               'sources': [ '<@(chrome_browser_task_manager_chromeos_sources)' ],
+            },

[Lei Zhang, 2016/04/23 00:52:32]

I think this only works because gyp added else-if at some point. It still looks
odd because the indentation is off.

Maybe do what line 3921 does?

['chromeos==1' {
  ...
}],
['OS=="mac"' {
  ...
}],

[afakhry, 2016/04/25 20:02:50]

Done.

+             'OS=="mac"', {
+              'sources': [
+                '<@(chrome_browser_old_task_manager_macosx_sources)'
+              ],
             }],
           ],
         }],