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

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

Issue 11414138: Encrypted Media: No NeedKey if --enable-encrypted-media is not set. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: resolve comments Created 8 years 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
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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifi er.h" 86 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifi er.h"
87 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenu.h" 87 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenu.h"
88 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" 88 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
89 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h " 89 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h "
90 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" 90 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
91 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 91 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
92 #include "ui/base/layout.h" 92 #include "ui/base/layout.h"
93 #include "ui/base/ui_base_switches.h" 93 #include "ui/base/ui_base_switches.h"
94 #include "v8/include/v8.h" 94 #include "v8/include/v8.h"
95 #include "webkit/glue/webkit_glue.h" 95 #include "webkit/glue/webkit_glue.h"
96 #include "webkit/media/media_switches.h"
96 97
97 #if defined(OS_WIN) 98 #if defined(OS_WIN)
98 #include <windows.h> 99 #include <windows.h>
99 #include <objbase.h> 100 #include <objbase.h>
100 #include "base/win/scoped_com_initializer.h" 101 #include "base/win/scoped_com_initializer.h"
101 #else 102 #else
102 // TODO(port) 103 // TODO(port)
103 #include "base/memory/scoped_handle.h" 104 #include "base/memory/scoped_handle.h"
104 #include "content/common/np_channel_base.h" 105 #include "content/common/np_channel_base.h"
105 #endif 106 #endif
(...skipping 1002 matching lines...) Expand 10 before | Expand all | Expand 10 after
1108 RenderThreadImpl::GetFileThreadMessageLoopProxy() { 1109 RenderThreadImpl::GetFileThreadMessageLoopProxy() {
1109 DCHECK(message_loop() == MessageLoop::current()); 1110 DCHECK(message_loop() == MessageLoop::current());
1110 if (!file_thread_.get()) { 1111 if (!file_thread_.get()) {
1111 file_thread_.reset(new base::Thread("Renderer::FILE")); 1112 file_thread_.reset(new base::Thread("Renderer::FILE"));
1112 file_thread_->Start(); 1113 file_thread_->Start();
1113 } 1114 }
1114 return file_thread_->message_loop_proxy(); 1115 return file_thread_->message_loop_proxy();
1115 } 1116 }
1116 1117
1117 } // namespace content 1118 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698