← Back to branch summary

~osomon/oxide/fix-crash-popup-menu

« back to all changes in this revision

Viewing changes to patches/load-nss-without-user-db.patch

  • Committer: Chris Coulson
  • Date: 2015-04-24 00:27:16 UTC
  • mfrom: (640.1.248 canary)
  • Revision ID: chris.coulson@canonical.com-20150424002716-rz2vs6ts1vgi6uvr
Bump Chromium rev to 44.0.2376.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/load-nss-without-user-db.patch
6
6
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc
7
7
--- a/crypto/nss_util.cc
8
8
+++ b/crypto/nss_util.cc
9
 
@@ -79,22 +79,20 @@ std::string GetNSSErrorMessage() {
 
9
@@ -78,22 +78,20 @@ std::string GetNSSErrorMessage() {
10
10
   }
11
11
   return result;
12
12
 }
13
13
 
14
 
 #if defined(USE_NSS)
 
14
 #if defined(USE_NSS_CERTS)
15
15
 #if !defined(OS_CHROMEOS)
16
16
 base::FilePath GetDefaultConfigDirectory() {
17
17
   base::FilePath dir;
42
42
 // initialization functions.
43
43
 namespace crypto {
44
44
 
45
 
 #if defined(USE_NSS)
 
45
 #if defined(USE_NSS_CERTS)
46
46
+
47
47
+enum {
48
48
+  PATH_START = 20000,