| OLD | NEW |
| 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 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 quota_info.temporary_usage + | 234 quota_info.temporary_usage + |
| 235 quota_info.persistent_usage))); | 235 quota_info.persistent_usage))); |
| 236 dict->SetString(kKeyTemporaryUsage, | 236 dict->SetString(kKeyTemporaryUsage, |
| 237 base::UTF16ToUTF8(ui::FormatBytes( | 237 base::UTF16ToUTF8(ui::FormatBytes( |
| 238 quota_info.temporary_usage))); | 238 quota_info.temporary_usage))); |
| 239 dict->SetString(kKeyPersistentUsage, | 239 dict->SetString(kKeyPersistentUsage, |
| 240 base::UTF16ToUTF8(ui::FormatBytes( | 240 base::UTF16ToUTF8(ui::FormatBytes( |
| 241 quota_info.persistent_usage))); | 241 quota_info.persistent_usage))); |
| 242 break; | 242 break; |
| 243 } | 243 } |
| 244 case CookieTreeNode::DetailedInfo::TYPE_SERVER_BOUND_CERT: { | 244 case CookieTreeNode::DetailedInfo::TYPE_CHANNEL_ID: { |
| 245 dict->SetString(kKeyType, "server_bound_cert"); | 245 dict->SetString(kKeyType, "channel_id"); |
| 246 dict->SetString(kKeyIcon, "chrome://theme/IDR_COOKIE_ICON"); | 246 dict->SetString(kKeyIcon, "chrome://theme/IDR_COOKIE_ICON"); |
| 247 | 247 |
| 248 const net::ServerBoundCertStore::ServerBoundCert& server_bound_cert = | 248 const net::ChannelIDStore::ChannelID& channel_id = |
| 249 *node.GetDetailedInfo().server_bound_cert; | 249 *node.GetDetailedInfo().channel_id; |
| 250 | 250 |
| 251 dict->SetString(kKeyServerId, server_bound_cert.server_identifier()); | 251 dict->SetString(kKeyServerId, channel_id.server_identifier()); |
| 252 dict->SetString(kKeyCertType, | 252 dict->SetString(kKeyCertType, |
| 253 ClientCertTypeToString(net::CLIENT_CERT_ECDSA_SIGN)); | 253 ClientCertTypeToString(net::CLIENT_CERT_ECDSA_SIGN)); |
| 254 dict->SetString(kKeyCreated, base::UTF16ToUTF8( | 254 dict->SetString(kKeyCreated, base::UTF16ToUTF8( |
| 255 base::TimeFormatFriendlyDateAndTime( | 255 base::TimeFormatFriendlyDateAndTime( |
| 256 server_bound_cert.creation_time()))); | 256 channel_id.creation_time()))); |
| 257 break; | 257 break; |
| 258 } | 258 } |
| 259 case CookieTreeNode::DetailedInfo::TYPE_FLASH_LSO: { | 259 case CookieTreeNode::DetailedInfo::TYPE_FLASH_LSO: { |
| 260 dict->SetString(kKeyType, "flash_lso"); | 260 dict->SetString(kKeyType, "flash_lso"); |
| 261 dict->SetString(kKeyIcon, "chrome://theme/IDR_COOKIE_ICON"); | 261 dict->SetString(kKeyIcon, "chrome://theme/IDR_COOKIE_ICON"); |
| 262 | 262 |
| 263 dict->SetString(kKeyDomain, node.GetDetailedInfo().flash_lso_domain); | 263 dict->SetString(kKeyDomain, node.GetDetailedInfo().flash_lso_domain); |
| 264 } | 264 } |
| 265 default: | 265 default: |
| 266 #if defined(OS_MACOSX) | 266 #if defined(OS_MACOSX) |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 child = id_map_.Lookup(node_id); | 317 child = id_map_.Lookup(node_id); |
| 318 child_index = parent->GetIndexOf(child); | 318 child_index = parent->GetIndexOf(child); |
| 319 if (child_index == -1) | 319 if (child_index == -1) |
| 320 break; | 320 break; |
| 321 | 321 |
| 322 parent = child; | 322 parent = child; |
| 323 } | 323 } |
| 324 | 324 |
| 325 return child_index >= 0 ? child : NULL; | 325 return child_index >= 0 ? child : NULL; |
| 326 } | 326 } |
| OLD | NEW |