mojo/mojo_services.gypi - Issue 567803002: Hook WebMediaPlayerImpl up to Mojo's HTMLDocumentView.

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: mojo/mojo_services.gypi

Issue 567803002: Hook WebMediaPlayerImpl up to Mojo's HTMLDocumentView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Move factory ownership to HTMLViewer. Created 6 years, 3 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

« media/blink/null_encrypted_media_player_support.cc ('K') | « media/blink/webmediaplayer_params.h ('k') | mojo/services/html_viewer/DEPS » ('j') | mojo/services/html_viewer/webmediaplayer_factory.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/mojo_services.gypi

diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi

index c5a68a4ce792fc7c6956efa8b6be709ad9164f7a..d57d625ec42a5db2fb91c7a2f18e2258f25585b5 100644

--- a/mojo/mojo_services.gypi

+++ b/mojo/mojo_services.gypi

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

'target_name': 'mojo_html_viewer',

'type': 'loadable_module',

'dependencies': [

+ '../media/blink/media_blink.gyp:media_blink',

+ '../media/media.gyp:media',

'../net/net.gyp:net',

'../skia/skia.gyp:skia',

'../third_party/WebKit/public/blink.gyp:blink',

@@ -40,6 +42,8 @@

'services/html_viewer/html_document_view.h',

'services/html_viewer/webcookiejar_impl.cc',

'services/html_viewer/webcookiejar_impl.h',

+ 'services/html_viewer/webmediaplayer_factory.cc',

+ 'services/html_viewer/webmediaplayer_factory.h',

'services/html_viewer/webmimeregistry_impl.cc',

'services/html_viewer/webmimeregistry_impl.h',

'services/html_viewer/websockethandle_impl.cc',