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

Side by Side Diff: chrome/plugin/chrome_content_plugin_client.cc

Issue 1082123003: Rename USE_NSS to USE_NSS_CERTS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use-nss-certs
Patch Set: rebase Created 5 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/plugin/chrome_content_plugin_client.h" 5 #include "chrome/plugin/chrome_content_plugin_client.h"
6 6
7 #if defined(ENABLE_REMOTING) 7 #if defined(ENABLE_REMOTING)
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "content/public/common/content_paths.h" 10 #include "content/public/common/content_paths.h"
11 #include "media/base/media.h" 11 #include "media/base/media.h"
12 #if defined(OS_WIN) 12 #if defined(OS_WIN)
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/native_library.h" 14 #include "base/native_library.h"
15 #elif defined(OS_POSIX) && !defined(OS_MACOSX) && defined(USE_NSS) 15 #elif defined(OS_POSIX) && !defined(OS_MACOSX) && defined(USE_NSS_CERTS)
16 #include "crypto/nss_util.h" 16 #include "crypto/nss_util.h"
17 #endif 17 #endif
18 #endif 18 #endif
19 19
20 #ifdef V8_USE_EXTERNAL_STARTUP_DATA 20 #ifdef V8_USE_EXTERNAL_STARTUP_DATA
21 #include "gin/v8_initializer.h" 21 #include "gin/v8_initializer.h"
22 #endif 22 #endif
23 23
24 namespace chrome { 24 namespace chrome {
25 25
26 void ChromeContentPluginClient::PreSandboxInitialization() { 26 void ChromeContentPluginClient::PreSandboxInitialization() {
27 #ifdef V8_USE_EXTERNAL_STARTUP_DATA 27 #ifdef V8_USE_EXTERNAL_STARTUP_DATA
28 gin::V8Initializer::LoadV8Snapshot(); 28 gin::V8Initializer::LoadV8Snapshot();
29 #endif 29 #endif
30 30
31 #if defined(ENABLE_REMOTING) 31 #if defined(ENABLE_REMOTING)
32 32
33 // Load crypto libraries for the Chromoting client plugin. 33 // Load crypto libraries for the Chromoting client plugin.
34 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(USE_NSS) 34 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(USE_NSS_CERTS)
35 // On platforms where we use system NSS libraries, the .so's must be loaded 35 // On platforms where we use system NSS libraries, the .so's must be loaded
36 // before the sandbox is initialized. 36 // before the sandbox is initialized.
37 crypto::ForceNSSNoDBInit(); 37 crypto::ForceNSSNoDBInit();
38 crypto::EnsureNSSInit(); 38 crypto::EnsureNSSInit();
39 #elif defined(OS_WIN) 39 #elif defined(OS_WIN)
40 // crypt32.dll is used to decode X509 certificates for Chromoting. 40 // crypt32.dll is used to decode X509 certificates for Chromoting.
41 base::NativeLibraryLoadError error; 41 base::NativeLibraryLoadError error;
42 if (base::LoadNativeLibrary(base::FilePath(L"crypt32.dll"), &error) == NULL) 42 if (base::LoadNativeLibrary(base::FilePath(L"crypt32.dll"), &error) == NULL)
43 LOG(ERROR) << "Failed to load crypto32.dll: " << error.ToString(); 43 LOG(ERROR) << "Failed to load crypto32.dll: " << error.ToString();
44 #endif // defined(OS_WIN) 44 #endif // defined(OS_WIN)
45 45
46 // Load media libraries for the Chromoting client plugin. 46 // Load media libraries for the Chromoting client plugin.
47 base::FilePath media_path; 47 base::FilePath media_path;
48 PathService::Get(content::DIR_MEDIA_LIBS, &media_path); 48 PathService::Get(content::DIR_MEDIA_LIBS, &media_path);
49 if (!media_path.empty()) 49 if (!media_path.empty())
50 media::InitializeMediaLibrary(media_path); 50 media::InitializeMediaLibrary(media_path);
51 51
52 #endif // defined(ENABLE_REMOTING) 52 #endif // defined(ENABLE_REMOTING)
53 } 53 }
54 54
55 } // namespace chrome 55 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/common/net/x509_certificate_model_unittest.cc ('k') | chrome/renderer/chrome_render_process_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698