Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7174)

Unified Diff: chrome/chrome_browser.gypi

Issue 1622733002: Add CombinedDesktopMediaList class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/desktop_media_picker_views.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index a4cf99ea39255fc21721cfdc9823c70b02a11328..bec0a8e65ef049564f944e773bfa6fe24b087e83 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -346,6 +346,8 @@
'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',
@@ -377,6 +379,8 @@
'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',
@@ -1171,8 +1175,6 @@
'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',
« no previous file with comments | « chrome/browser/ui/views/desktop_media_picker_views.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698