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

Side by Side Diff: chrome/renderer/chrome_render_process_observer.cc

Issue 10543146: Use NSS for symmetric key crypto operations on Windows and Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: removed DEPS; rebased Created 8 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | crypto/crypto.gyp » ('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 "chrome/renderer/chrome_render_process_observer.h" 5 #include "chrome/renderer/chrome_render_process_observer.h"
6 6
7 #include "base/allocator/allocator_extension.h" 7 #include "base/allocator/allocator_extension.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 if (PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf) && 183 if (PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf) &&
184 file_util::PathExists(pdf)) { 184 file_util::PathExists(pdf)) {
185 g_iat_patch_createdca.Patch( 185 g_iat_patch_createdca.Patch(
186 pdf.value().c_str(), "gdi32.dll", "CreateDCA", CreateDCAPatch); 186 pdf.value().c_str(), "gdi32.dll", "CreateDCA", CreateDCAPatch);
187 g_iat_patch_get_font_data.Patch( 187 g_iat_patch_get_font_data.Patch(
188 pdf.value().c_str(), "gdi32.dll", "GetFontData", GetFontDataPatch); 188 pdf.value().c_str(), "gdi32.dll", "GetFontData", GetFontDataPatch);
189 } 189 }
190 #endif 190 #endif
191 191
192 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(USE_NSS) 192 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(USE_NSS)
193 // Remoting requires NSS to function properly. 193 // On platforms where we use system NSS libraries, the .so's must be loaded.
194 if (!command_line.HasSwitch(switches::kSingleProcess)) { 194 if (!command_line.HasSwitch(switches::kSingleProcess)) {
195 // We are going to fork to engage the sandbox and we have not loaded 195 // We are going to fork to engage the sandbox and we have not loaded
196 // any security modules so it is safe to disable the fork check in NSS. 196 // any security modules so it is safe to disable the fork check in NSS.
197 crypto::DisableNSSForkCheck(); 197 crypto::DisableNSSForkCheck();
198 crypto::ForceNSSNoDBInit(); 198 crypto::ForceNSSNoDBInit();
199 crypto::EnsureNSSInit(); 199 crypto::EnsureNSSInit();
200 } 200 }
201 #elif defined(OS_WIN) 201 #elif defined(OS_WIN)
202 // crypt32.dll is used to decode X509 certificates for Chromoting. 202 // crypt32.dll is used to decode X509 certificates for Chromoting.
203 // Only load this library when the feature is enabled. 203 // Only load this library when the feature is enabled.
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 if (clear_cache_pending_) { 350 if (clear_cache_pending_) {
351 clear_cache_pending_ = false; 351 clear_cache_pending_ = false;
352 WebCache::clear(); 352 WebCache::clear();
353 } 353 }
354 } 354 }
355 355
356 const RendererContentSettingRules* 356 const RendererContentSettingRules*
357 ChromeRenderProcessObserver::content_setting_rules() const { 357 ChromeRenderProcessObserver::content_setting_rules() const {
358 return &content_setting_rules_; 358 return &content_setting_rules_;
359 } 359 }
OLDNEW
« no previous file with comments | « no previous file | crypto/crypto.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698