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

Side by Side Diff: chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp

Issue 450053003: Use a qualified path for grit includes in various chrome/ directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove webkit strings that no longer exist Created 6 years, 4 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
OLDNEW
1 /* ***** BEGIN LICENSE BLOCK ***** 1 /* ***** BEGIN LICENSE BLOCK *****
2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
3 * 3 *
4 * The contents of this file are subject to the Mozilla Public License Version 4 * The contents of this file are subject to the Mozilla Public License Version
5 * 1.1 (the "License"); you may not use this file except in compliance with 5 * 1.1 (the "License"); you may not use this file except in compliance with
6 * the License. You may obtain a copy of the License at 6 * the License. You may obtain a copy of the License at
7 * http://www.mozilla.org/MPL/ 7 * http://www.mozilla.org/MPL/
8 * 8 *
9 * Software distributed under the License is distributed on an "AS IS" basis, 9 * Software distributed under the License is distributed on an "AS IS" basis,
10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 #include <prprf.h> 45 #include <prprf.h>
46 #include <unicode/uidna.h> 46 #include <unicode/uidna.h>
47 47
48 #include "base/i18n/number_formatting.h" 48 #include "base/i18n/number_formatting.h"
49 #include "base/lazy_instance.h" 49 #include "base/lazy_instance.h"
50 #include "base/strings/string_number_conversions.h" 50 #include "base/strings/string_number_conversions.h"
51 #include "base/strings/stringprintf.h" 51 #include "base/strings/stringprintf.h"
52 #include "base/strings/utf_string_conversions.h" 52 #include "base/strings/utf_string_conversions.h"
53 #include "chrome/common/net/x509_certificate_model.h" 53 #include "chrome/common/net/x509_certificate_model.h"
54 #include "crypto/scoped_nss_types.h" 54 #include "crypto/scoped_nss_types.h"
55 #include "grit/generated_resources.h" 55 #include "chrome/grit/generated_resources.h"
56 #include "net/base/ip_endpoint.h" 56 #include "net/base/ip_endpoint.h"
57 #include "net/base/net_util.h" 57 #include "net/base/net_util.h"
58 #include "ui/base/l10n/l10n_util.h" 58 #include "ui/base/l10n/l10n_util.h"
59 59
60 #if !defined(CERTDB_TERMINAL_RECORD) 60 #if !defined(CERTDB_TERMINAL_RECORD)
61 /* NSS 3.13 renames CERTDB_VALID_PEER to CERTDB_TERMINAL_RECORD 61 /* NSS 3.13 renames CERTDB_VALID_PEER to CERTDB_TERMINAL_RECORD
62 * and marks CERTDB_VALID_PEER as deprecated. 62 * and marks CERTDB_VALID_PEER as deprecated.
63 * If we're using an older version, rename it ourselves. 63 * If we're using an older version, rename it ourselves.
64 */ 64 */
65 #define CERTDB_TERMINAL_RECORD CERTDB_VALID_PEER 65 #define CERTDB_TERMINAL_RECORD CERTDB_VALID_PEER
(...skipping 1008 matching lines...) Expand 10 before | Expand all | Expand 10 after
1074 return net::USER_CERT; 1074 return net::USER_CERT;
1075 if ((all_flags & CERTDB_VALID_CA) || CERT_IsCACert(cert, NULL)) 1075 if ((all_flags & CERTDB_VALID_CA) || CERT_IsCACert(cert, NULL))
1076 return net::CA_CERT; 1076 return net::CA_CERT;
1077 // TODO(mattm): http://crbug.com/128633. 1077 // TODO(mattm): http://crbug.com/128633.
1078 if (trust.sslFlags & CERTDB_TERMINAL_RECORD) 1078 if (trust.sslFlags & CERTDB_TERMINAL_RECORD)
1079 return net::SERVER_CERT; 1079 return net::SERVER_CERT;
1080 return net::OTHER_CERT; 1080 return net::OTHER_CERT;
1081 } 1081 }
1082 1082
1083 } // namespace mozilla_security_manager 1083 } // namespace mozilla_security_manager
OLDNEW
« no previous file with comments | « chrome/third_party/mozilla_security_manager/DEPS ('k') | chrome/third_party/mozilla_security_manager/nsNSSCertificate.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698