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

Side by Side Diff: chromecast/renderer/cast_content_renderer_client.cc

Issue 1222193007: Don't initialize NSS in Cast renderers for the chimera build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 | « no previous file | 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chromecast/renderer/cast_content_renderer_client.h" 5 #include "chromecast/renderer/cast_content_renderer_client.h"
6 6
7 #include <sys/sysinfo.h> 7 #include <sys/sysinfo.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 blink::WebLocalFrame* frame) { 107 blink::WebLocalFrame* frame) {
108 } 108 }
109 109
110 std::vector<scoped_refptr<IPC::MessageFilter>> 110 std::vector<scoped_refptr<IPC::MessageFilter>>
111 CastContentRendererClient::GetRendererMessageFilters() { 111 CastContentRendererClient::GetRendererMessageFilters() {
112 return std::vector<scoped_refptr<IPC::MessageFilter>>(); 112 return std::vector<scoped_refptr<IPC::MessageFilter>>();
113 } 113 }
114 114
115 void CastContentRendererClient::RenderThreadStarted() { 115 void CastContentRendererClient::RenderThreadStarted() {
116 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); 116 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
117 #if defined(USE_NSS_CERTS) 117 #if !defined(USE_OPENSSL)
118 // Note: Copied from chrome_render_process_observer.cc to fix b/8676652. 118 // Note: Copied from chrome_render_process_observer.cc to fix b/8676652.
119 // 119 //
120 // On platforms where the system NSS shared libraries are used, 120 // On platforms where the system NSS shared libraries are used,
121 // initialize NSS now because it won't be able to load the .so's 121 // initialize NSS now because it won't be able to load the .so's
122 // after entering the sandbox. 122 // after entering the sandbox.
123 if (!command_line->HasSwitch(switches::kSingleProcess)) 123 if (!command_line->HasSwitch(switches::kSingleProcess))
124 crypto::InitNSSSafely(); 124 crypto::InitNSSSafely();
125 #endif 125 #endif
126 126
127 #if defined(ARCH_CPU_ARM_FAMILY) && !defined(OS_ANDROID) 127 #if defined(ARCH_CPU_ARM_FAMILY) && !defined(OS_ANDROID)
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 closure.Run(); 215 closure.Run();
216 return; 216 return;
217 } 217 }
218 218
219 // Lifetime is tied to |render_frame| via content::RenderFrameObserver. 219 // Lifetime is tied to |render_frame| via content::RenderFrameObserver.
220 new CastMediaLoadDeferrer(render_frame, closure); 220 new CastMediaLoadDeferrer(render_frame, closure);
221 } 221 }
222 222
223 } // namespace shell 223 } // namespace shell
224 } // namespace chromecast 224 } // namespace chromecast
OLDNEW
« 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