Add CombinedDesktopMediaList class

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 328 matching lines @@
       'browser/mac/master_prefs.h',
       'browser/mac/master_prefs.mm',
       'browser/mac/relauncher.cc',
       'browser/mac/relauncher.h',
       'browser/mac/security_wrappers.cc',
       'browser/mac/security_wrappers.h',
       'browser/manifest/manifest_icon_downloader.cc',
       'browser/manifest/manifest_icon_downloader.h',
       'browser/manifest/manifest_icon_selector.cc',
       'browser/manifest/manifest_icon_selector.h',
+      'browser/media/combined_desktop_media_list.cc',
+      'browser/media/combined_desktop_media_list.h',
       'browser/media/desktop_media_list.h',
       'browser/media/desktop_media_list_base.cc',
       'browser/media/desktop_media_list_base.h',
       'browser/media/desktop_media_picker.h',
       'browser/media/desktop_streams_registry.cc',
       'browser/media/desktop_streams_registry.h',
       'browser/media/media_access_handler.h',
       'browser/media/media_capture_devices_dispatcher.cc',
       'browser/media/media_capture_devices_dispatcher.h',
       'browser/media/media_device_id_salt.cc',
@@ skipping 11 matching lines @@
       'browser/media/media_stream_devices_controller.cc',
       'browser/media/media_stream_devices_controller.h',
       'browser/media/media_stream_mic_permission_context_factory.cc',
       'browser/media/media_stream_mic_permission_context_factory.h',
       'browser/media/media_url_constants.cc',
       'browser/media/media_url_constants.h',
       'browser/media/midi_permission_context.cc',
       'browser/media/midi_permission_context.h',
       'browser/media/midi_permission_context_factory.cc',
       'browser/media/midi_permission_context_factory.h',
+      'browser/media/native_desktop_media_list.cc',
+      'browser/media/native_desktop_media_list.h',
       'browser/media/permission_bubble_media_access_handler.cc',
       'browser/media/permission_bubble_media_access_handler.h',
       'browser/media/router/media_router_feature.cc',
       'browser/media/router/media_router_feature.h',
       # TODO(brettw) should this go with the webrtc sources?
       'browser/media/webrtc_log_list.cc',
       'browser/media/webrtc_log_list.h',
       'browser/memory_details.cc',
       'browser/memory_details.h',
       'browser/memory_details_android.cc',
@@ skipping 774 matching lines @@
       'browser/importer/importer_lock_dialog.h',
       'browser/importer/importer_progress_observer.h',
       'browser/importer/importer_uma.cc',
       'browser/importer/importer_uma.h',
       'browser/importer/in_process_importer_bridge.cc',
       'browser/importer/in_process_importer_bridge.h',
       'browser/importer/profile_writer.cc',
       'browser/importer/profile_writer.h',
       'browser/lifetime/browser_close_manager.cc',
       'browser/lifetime/browser_close_manager.h',
-      'browser/media/native_desktop_media_list.cc',
-      'browser/media/native_desktop_media_list.h',
       'browser/media_galleries/fileapi/av_scanning_file_validator.cc',
       'browser/media_galleries/fileapi/av_scanning_file_validator.h',
       'browser/media_galleries/fileapi/device_media_async_file_util.cc',
       'browser/media_galleries/fileapi/device_media_async_file_util.h',
       'browser/media_galleries/fileapi/iapps_finder.h',
       'browser/media_galleries/fileapi/iapps_finder_impl.cc',
       'browser/media_galleries/fileapi/iapps_finder_impl.h',
       'browser/media_galleries/fileapi/iapps_finder_impl_mac.mm',
       'browser/media_galleries/fileapi/iapps_finder_impl_win.cc',
       'browser/media_galleries/fileapi/media_file_system_backend.cc',
@@ skipping 3005 matching lines @@
             '../components/components.gyp:omnibox_browser',
             '../components/components.gyp:rlz',
             '../components/components.gyp:search_engines',
             '../rlz/rlz.gyp:rlz_lib',
           ],
         },
       ],
     }],
   ],
 }