chrome/chrome_browser.gypi - Issue 1622733002: Add CombinedDesktopMediaList class

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/chrome_browser.gypi

Issue 1622733002: Add CombinedDesktopMediaList class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed for android build 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:

Index: chrome/chrome_browser.gypi

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi

index 0ba9fbc8590e8952e07369618a2ceb8139c3f7de..d9fd3af415f7cc155783f5ada121581bc08bea23 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,8 @@

'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/tab_desktop_media_list.cc',

+ 'browser/media/tab_desktop_media_list.h',

'browser/media_galleries/android/mtp_device_delegate_impl_android.cc',

'browser/media_galleries/fileapi/av_scanning_file_validator.cc',

'browser/media_galleries/fileapi/av_scanning_file_validator.h',