Chromium Code Reviews Chromium Code Reviews
Issue 514493002:
Cleanup: Remove unneeded grit include in chrome. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@grit_clean_chromium_strings_401588_a| OLD | NEW |
|---|---|
| 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 24 matching lines...) Expand all Loading... | |
| 35 * and other provisions required by the GPL or the LGPL. If you do not delete | 35 * and other provisions required by the GPL or the LGPL. If you do not delete |
| 36 * the provisions above, a recipient may use your version of this file under | 36 * the provisions above, a recipient may use your version of this file under |
| 37 * the terms of any one of the MPL, the GPL or the LGPL. | 37 * the terms of any one of the MPL, the GPL or the LGPL. |
| 38 * | 38 * |
| 39 * ***** END LICENSE BLOCK ***** */ | 39 * ***** END LICENSE BLOCK ***** */ |
| 40 | 40 |
| 41 #include "chrome/third_party/mozilla_security_manager/nsNSSCertificate.h" | 41 #include "chrome/third_party/mozilla_security_manager/nsNSSCertificate.h" |
| 42 | 42 |
| 43 #include <pk11func.h> | 43 #include <pk11func.h> |
| 44 | 44 |
| 45 #include "chrome/grit/generated_resources.h" | |
| 46 #include "ui/base/l10n/l10n_util.h" | |
|
Nico
2014/08/29 17:54:55
Hm, I wonder why this even got added, given that t
mattm
2014/08/29 18:57:54
These files are under third_party since they are b
| |
| 47 | |
| 48 namespace mozilla_security_manager { | 45 namespace mozilla_security_manager { |
| 49 | 46 |
| 50 std::string GetCertTitle(CERTCertificate* cert) { | 47 std::string GetCertTitle(CERTCertificate* cert) { |
| 51 std::string rv; | 48 std::string rv; |
| 52 if (cert->nickname) { | 49 if (cert->nickname) { |
| 53 rv = cert->nickname; | 50 rv = cert->nickname; |
| 54 } else { | 51 } else { |
| 55 char* cn = CERT_GetCommonName(&cert->subject); | 52 char* cn = CERT_GetCommonName(&cert->subject); |
| 56 if (cn) { | 53 if (cn) { |
| 57 rv = cn; | 54 rv = cn; |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 69 | 66 |
| 70 std::string GetCertTokenName(CERTCertificate* cert) { | 67 std::string GetCertTokenName(CERTCertificate* cert) { |
| 71 std::string token; | 68 std::string token; |
| 72 if (cert->slot) { | 69 if (cert->slot) { |
| 73 token = PK11_GetTokenName(cert->slot); | 70 token = PK11_GetTokenName(cert->slot); |
| 74 } | 71 } |
| 75 return token; | 72 return token; |
| 76 } | 73 } |
| 77 | 74 |
| 78 } // namespace mozilla_security_manager | 75 } // namespace mozilla_security_manager |
| OLD | NEW |
