content/content_browser.gypi - Issue 1478643002: Refactor media out of WebContentsImpl to MediaWebContentsObserver.

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: content/content_browser.gypi

Issue 1478643002: Refactor media out of WebContentsImpl to MediaWebContentsObserver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix android. Created 5 years 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 | « content/browser/web_contents/web_contents_impl_unittest.cc ('k') | content/public/browser/web_contents_observer.h » ('j') | content/test/web_contents_observer_sanity_checker.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/content_browser.gypi

diff --git a/content/content_browser.gypi b/content/content_browser.gypi

index be7aed749b266f000d86c3a75966a9769f11d97c..0a16ba61d7232c5268a5610d7f6a6097a4eef8b6 100644

--- a/content/content_browser.gypi

+++ b/content/content_browser.gypi

@@ -1010,6 +1010,8 @@

'browser/media/media_internals_proxy.h',

'browser/media/media_internals_ui.cc',

'browser/media/media_internals_ui.h',

+ 'browser/media/media_web_contents_observer.cc',

+ 'browser/media/media_web_contents_observer.h',

'browser/media/midi_host.cc',

'browser/media/midi_host.h',

'browser/media/webrtc_identity_store.cc',

@@ -2171,9 +2173,6 @@

'sources': [

'browser/media/cdm/browser_cdm_manager.cc',

'browser/media/cdm/browser_cdm_manager.h',

- # This works on Android because enable_browser_cdms==1 on Android.

- 'browser/media/media_web_contents_observer.cc',

- 'browser/media/media_web_contents_observer.h',

}],

['OS == "linux"', {