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

Side by Side Diff: chrome/browser/ui/webui/cookies_tree_model_util.cc

Issue 12221136: Add CLIENT_CERT_TYPE_DSS_SIGN to net::SSLClientCertType (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 10 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) 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/browser/ui/webui/cookies_tree_model_util.h" 5 #include "chrome/browser/ui/webui/cookies_tree_model_util.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/i18n/time_formatting.h" 9 #include "base/i18n/time_formatting.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 const char kKeyPersistentQuota[] = "persistentQuota"; 53 const char kKeyPersistentQuota[] = "persistentQuota";
54 54
55 const char kKeyCertType[] = "certType"; 55 const char kKeyCertType[] = "certType";
56 56
57 const int64 kNegligibleUsage = 1024; // 1KiB 57 const int64 kNegligibleUsage = 1024; // 1KiB
58 58
59 std::string ClientCertTypeToString(net::SSLClientCertType type) { 59 std::string ClientCertTypeToString(net::SSLClientCertType type) {
60 switch (type) { 60 switch (type) {
61 case net::CLIENT_CERT_RSA_SIGN: 61 case net::CLIENT_CERT_RSA_SIGN:
62 return l10n_util::GetStringUTF8(IDS_CLIENT_CERT_RSA_SIGN); 62 return l10n_util::GetStringUTF8(IDS_CLIENT_CERT_RSA_SIGN);
63 case net::CLIENT_CERT_DSS_SIGN:
64 return l10n_util::GetStringUTF8(IDS_CLIENT_CERT_DSS_SIGN);
63 case net::CLIENT_CERT_ECDSA_SIGN: 65 case net::CLIENT_CERT_ECDSA_SIGN:
64 return l10n_util::GetStringUTF8(IDS_CLIENT_CERT_ECDSA_SIGN); 66 return l10n_util::GetStringUTF8(IDS_CLIENT_CERT_ECDSA_SIGN);
65 default: 67 default:
66 return base::IntToString(type); 68 return base::IntToString(type);
67 } 69 }
68 } 70 }
69 71
70 } // namespace 72 } // namespace
71 73
72 CookiesTreeModelUtil::CookiesTreeModelUtil() { 74 CookiesTreeModelUtil::CookiesTreeModelUtil() {
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 child = id_map_.Lookup(node_id); 314 child = id_map_.Lookup(node_id);
313 child_index = parent->GetIndexOf(child); 315 child_index = parent->GetIndexOf(child);
314 if (child_index == -1) 316 if (child_index == -1)
315 break; 317 break;
316 318
317 parent = child; 319 parent = child;
318 } 320 }
319 321
320 return child_index >= 0 ? child : NULL; 322 return child_index >= 0 ? child : NULL;
321 } 323 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698