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

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 9433046: Add flag that enable Encrypted Media Extensions on video elements. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 8 years, 8 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 unified diff | Download patch
« no previous file with comments | « content/public/common/content_switches.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 537
538 WebKit::WebRuntimeFeatures::enableFullScreenAPI( 538 WebKit::WebRuntimeFeatures::enableFullScreenAPI(
539 !command_line.HasSwitch(switches::kDisableFullScreen)); 539 !command_line.HasSwitch(switches::kDisableFullScreen));
540 540
541 WebKit::WebRuntimeFeatures::enablePointerLock( 541 WebKit::WebRuntimeFeatures::enablePointerLock(
542 command_line.HasSwitch(switches::kEnablePointerLock)); 542 command_line.HasSwitch(switches::kEnablePointerLock));
543 543
544 WebKit::WebRuntimeFeatures::enableVideoTrack( 544 WebKit::WebRuntimeFeatures::enableVideoTrack(
545 command_line.HasSwitch(switches::kEnableVideoTrack)); 545 command_line.HasSwitch(switches::kEnableVideoTrack));
546 546
547 WebKit::WebRuntimeFeatures::enableEncryptedMedia(
548 command_line.HasSwitch(switches::kEnableEncryptedMedia));
549
547 #if defined(OS_CHROMEOS) 550 #if defined(OS_CHROMEOS)
548 // TODO(crogers): enable once Web Audio has been tested and optimized. 551 // TODO(crogers): enable once Web Audio has been tested and optimized.
549 WebRuntimeFeatures::enableWebAudio(false); 552 WebRuntimeFeatures::enableWebAudio(false);
550 #else 553 #else
551 WebRuntimeFeatures::enableWebAudio( 554 WebRuntimeFeatures::enableWebAudio(
552 !command_line.HasSwitch(switches::kDisableWebAudio)); 555 !command_line.HasSwitch(switches::kDisableWebAudio));
553 #endif 556 #endif
554 557
555 WebRuntimeFeatures::enablePushState(true); 558 WebRuntimeFeatures::enablePushState(true);
556 559
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
982 985
983 scoped_refptr<base::MessageLoopProxy> 986 scoped_refptr<base::MessageLoopProxy>
984 RenderThreadImpl::GetFileThreadMessageLoopProxy() { 987 RenderThreadImpl::GetFileThreadMessageLoopProxy() {
985 DCHECK(message_loop() == MessageLoop::current()); 988 DCHECK(message_loop() == MessageLoop::current());
986 if (!file_thread_.get()) { 989 if (!file_thread_.get()) {
987 file_thread_.reset(new base::Thread("Renderer::FILE")); 990 file_thread_.reset(new base::Thread("Renderer::FILE"));
988 file_thread_->Start(); 991 file_thread_->Start();
989 } 992 }
990 return file_thread_->message_loop_proxy(); 993 return file_thread_->message_loop_proxy();
991 } 994 }
OLDNEW
« no previous file with comments | « content/public/common/content_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698