Remove the old task manager view

chrome/chrome_browser.gypi

 # Copyright 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     # All .cc, .h, .m, and .mm files under browser except for:
     # * tests and mocks.
     # * code below browser/chromeos
     # * code below browser/extensions
@@ skipping 2429 matching lines @@
       'browser/printing/print_view_manager.h',
       'browser/printing/printer_manager_dialog.h',
       'browser/printing/printer_manager_dialog_linux.cc',
       'browser/printing/printer_manager_dialog_mac.mm',
       'browser/printing/printer_manager_dialog_win.cc',
       'browser/printing/pwg_raster_converter.cc',
       'browser/printing/pwg_raster_converter.h',
       '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',
       'browser/profiles/bookmark_model_loaded_observer.cc',
       'browser/profiles/bookmark_model_loaded_observer.h',
       'browser/profiles/chrome_browser_main_extra_parts_profiles.cc',
       'browser/profiles/chrome_browser_main_extra_parts_profiles.h',
       'browser/profiles/chrome_version_service.cc',
       'browser/profiles/chrome_version_service.h',
       'browser/profiles/gaia_info_update_service.cc',
@@ skipping 518 matching lines @@
       'browser/sync/glue/synced_window_delegate_android.cc',
       'browser/sync/glue/synced_window_delegate_android.h',
       'browser/sync/glue/synced_window_delegates_getter_android.cc',
       'browser/sync/glue/synced_window_delegates_getter_android.h',
       'browser/sync/profile_sync_service_android.cc',
       'browser/sync/profile_sync_service_android.h',
       'browser/sync/sync_sessions_metrics_android.cc',
       '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',
       'browser/task_management/providers/browser_process_task_provider.cc',
       'browser/task_management/providers/browser_process_task_provider.h',
       'browser/task_management/providers/child_process_task.cc',
       'browser/task_management/providers/child_process_task.h',
       'browser/task_management/providers/child_process_task_provider.cc',
       'browser/task_management/providers/child_process_task_provider.h',
       'browser/task_management/providers/task.cc',
       'browser/task_management/providers/task.h',
@@ skipping 49 matching lines @@
       'browser/task_management/sampling/task_manager_impl.cc',
       'browser/task_management/sampling/task_manager_impl.h',
       'browser/task_management/sampling/task_manager_io_thread_helper.cc',
       'browser/task_management/sampling/task_manager_io_thread_helper.h',
       'browser/task_management/task_management_browsertest_util.cc',
       'browser/task_management/task_management_browsertest_util.h',
       'browser/task_management/task_manager_interface.cc',
       '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',
       'browser/task_manager/browser_process_resource_provider.h',
       'browser/task_manager/child_process_resource_provider.cc',
       'browser/task_manager/child_process_resource_provider.h',
       'browser/task_manager/extension_information.cc',
       'browser/task_manager/extension_information.h',
       'browser/task_manager/guest_information.cc',
       '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',
       'browser/task_manager/resource_provider.h',
       'browser/task_manager/tab_contents_information.cc',
       'browser/task_manager/tab_contents_information.h',
       'browser/task_manager/task_manager.cc',
       'browser/task_manager/task_manager.h',
       'browser/task_manager/task_manager_util.cc',
       'browser/task_manager/task_manager_util.h',
@@ skipping 409 matching lines @@
               ],
             }],
           ],
         }],
         ['enable_task_manager==1', {
           'sources': [ '<@(chrome_browser_task_manager_sources)' ],
           'dependencies': [ '../gpu/gpu.gyp:gpu' ],
           '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)'
+              ],
             }],
           ],
         }],
         ['enable_media_router==1', {
           'dependencies': [
             'browser/media/router/media_router.gyp:media_router',
           ],
         }],
         ['branding!="Chrome"', {
           'sources': [
@@ skipping 702 matching lines @@
             '../components/components.gyp:rlz',
             '../components/components.gyp:search_engines',
             '../rlz/rlz.gyp:rlz_lib',
             'common',
           ],
         },
       ],
     }],
   ],
 }