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

Unified Diff: mojo/services/html_viewer/webmediaplayer_factory.cc

Issue 563953003: GN rules for everything in //mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « mojo/services/html_viewer/BUILD.gn ('k') | mojo/services/native_viewport/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/html_viewer/webmediaplayer_factory.cc
diff --git a/mojo/services/html_viewer/webmediaplayer_factory.cc b/mojo/services/html_viewer/webmediaplayer_factory.cc
index 5bd14858c2d1dbf386a9a9e6a22d6fb6e400df24..e5309a9c00085c57f071e1e11183de90ee2f800a 100644
--- a/mojo/services/html_viewer/webmediaplayer_factory.cc
+++ b/mojo/services/html_viewer/webmediaplayer_factory.cc
@@ -44,6 +44,9 @@ blink::WebMediaPlayer* WebMediaPlayerFactory::CreateMediaPlayer(
blink::WebLocalFrame* frame,
const blink::WebURL& url,
blink::WebMediaPlayerClient* client) {
+#if defined(OS_ANDROID)
+ return NULL;
+#else
media::WebMediaPlayerParams params(
media::WebMediaPlayerParams::DeferLoadCB(),
@@ -57,6 +60,7 @@ blink::WebMediaPlayer* WebMediaPlayerFactory::CreateMediaPlayer(
base::WeakPtr<media::WebMediaPlayerDelegate> delegate;
return new media::WebMediaPlayerImpl(frame, client, delegate, params);
+#endif
}
const media::AudioHardwareConfig&
« no previous file with comments | « mojo/services/html_viewer/BUILD.gn ('k') | mojo/services/native_viewport/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698