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

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: fix tests 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
« no previous file with comments | « content/public/common/content_switches.cc ('k') | media/base/media_switches.h » ('j') | 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 #include "content/renderer/p2p/socket_dispatcher.h" 66 #include "content/renderer/p2p/socket_dispatcher.h"
67 #include "content/renderer/plugin_channel_host.h" 67 #include "content/renderer/plugin_channel_host.h"
68 #include "content/renderer/render_process_impl.h" 68 #include "content/renderer/render_process_impl.h"
69 #include "content/renderer/render_view_impl.h" 69 #include "content/renderer/render_view_impl.h"
70 #include "content/renderer/renderer_webkitplatformsupport_impl.h" 70 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
71 #include "grit/content_resources.h" 71 #include "grit/content_resources.h"
72 #include "ipc/ipc_channel_handle.h" 72 #include "ipc/ipc_channel_handle.h"
73 #include "ipc/ipc_forwarding_message_filter.h" 73 #include "ipc/ipc_forwarding_message_filter.h"
74 #include "ipc/ipc_platform_file.h" 74 #include "ipc/ipc_platform_file.h"
75 #include "media/base/media.h" 75 #include "media/base/media.h"
76 #include "media/base/media_switches.h"
76 #include "net/base/net_errors.h" 77 #include "net/base/net_errors.h"
77 #include "net/base/net_util.h" 78 #include "net/base/net_util.h"
78 #include "third_party/WebKit/Source/Platform/chromium/public/Platform.h" 79 #include "third_party/WebKit/Source/Platform/chromium/public/Platform.h"
79 #include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorSuppor t.h" 80 #include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorSuppor t.h"
80 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" 81 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
81 #include "third_party/WebKit/Source/WebKit/chromium/public/WebColorName.h" 82 #include "third_party/WebKit/Source/WebKit/chromium/public/WebColorName.h"
82 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h" 83 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h"
83 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" 84 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
84 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" 85 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
85 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" 86 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
(...skipping 1022 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
« no previous file with comments | « content/public/common/content_switches.cc ('k') | media/base/media_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698