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

Unified Diff: content/renderer/render_view_impl.cc

Issue 11066101: Tentatively turn on WebMediaPlayerMS by default. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: use static function to check if url is media stream 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 | « content/renderer/media/media_stream_impl.cc ('k') | 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 161195)
+++ content/renderer/render_view_impl.cc (working copy)
@@ -2649,12 +2649,11 @@
if (!media_player) {
// TODO(wjia): when all patches related to WebMediaPlayerMS have been
// landed, remove the switch. Refer to crbug.com/142988.
- if (cmd_line->HasSwitch(switches::kEnableWebMediaPlayerMS)) {
+ if (!cmd_line->HasSwitch(switches::kDisableWebMediaPlayerMS) &&
+ MediaStreamImpl::CheckMediaStream(url)) {
EnsureMediaStreamImpl();
- if (media_stream_impl_ && media_stream_impl_->IsMediaStream(url)) {
- return new webkit_media::WebMediaPlayerMS(
- frame, client, AsWeakPtr(), media_stream_impl_, render_media_log);
- }
+ return new webkit_media::WebMediaPlayerMS(
+ frame, client, AsWeakPtr(), media_stream_impl_, render_media_log);
}
media_player = new webkit_media::WebMediaPlayerImpl(
« no previous file with comments | « content/renderer/media/media_stream_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698