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

Unified Diff: content/renderer/render_view_impl.cc

Issue 11066123: Enable WebMediaPlayerMS only when ENABLE_WEBRTC is defined. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
===================================================================
--- content/renderer/render_view_impl.cc (revision 161359)
+++ content/renderer/render_view_impl.cc (working copy)
@@ -2647,6 +2647,7 @@
audio_source_provider, message_loop_factory, media_stream_impl_,
render_media_log);
if (!media_player) {
+#if defined(ENABLE_WEBRTC)
// TODO(wjia): when all patches related to WebMediaPlayerMS have been
// landed, remove the switch. Refer to crbug.com/142988.
if (!cmd_line->HasSwitch(switches::kDisableWebMediaPlayerMS) &&
@@ -2655,6 +2656,7 @@
return new webkit_media::WebMediaPlayerMS(
frame, client, AsWeakPtr(), media_stream_impl_, render_media_log);
}
+#endif
media_player = new webkit_media::WebMediaPlayerImpl(
frame, client, AsWeakPtr(), collection, audio_source_provider,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698