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

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

Issue 14081009: Remove obsolete Channel ID expiration time from site data viewer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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
« no previous file with comments | « chrome/browser/resources/options/cookies_list.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 242
243 const net::ServerBoundCertStore::ServerBoundCert& server_bound_cert = 243 const net::ServerBoundCertStore::ServerBoundCert& server_bound_cert =
244 *node.GetDetailedInfo().server_bound_cert; 244 *node.GetDetailedInfo().server_bound_cert;
245 245
246 dict->SetString(kKeyServerId, server_bound_cert.server_identifier()); 246 dict->SetString(kKeyServerId, server_bound_cert.server_identifier());
247 dict->SetString(kKeyCertType, 247 dict->SetString(kKeyCertType,
248 ClientCertTypeToString(server_bound_cert.type())); 248 ClientCertTypeToString(server_bound_cert.type()));
249 dict->SetString(kKeyCreated, UTF16ToUTF8( 249 dict->SetString(kKeyCreated, UTF16ToUTF8(
250 base::TimeFormatFriendlyDateAndTime( 250 base::TimeFormatFriendlyDateAndTime(
251 server_bound_cert.creation_time()))); 251 server_bound_cert.creation_time())));
252 dict->SetString(kKeyExpires, UTF16ToUTF8(
253 base::TimeFormatFriendlyDateAndTime(
254 server_bound_cert.expiration_time())));
255 break; 252 break;
256 } 253 }
257 case CookieTreeNode::DetailedInfo::TYPE_FLASH_LSO: { 254 case CookieTreeNode::DetailedInfo::TYPE_FLASH_LSO: {
258 dict->SetString(kKeyType, "flash_lso"); 255 dict->SetString(kKeyType, "flash_lso");
259 dict->SetString(kKeyIcon, "chrome://theme/IDR_COOKIE_ICON"); 256 dict->SetString(kKeyIcon, "chrome://theme/IDR_COOKIE_ICON");
260 257
261 dict->SetString(kKeyDomain, node.GetDetailedInfo().flash_lso_domain); 258 dict->SetString(kKeyDomain, node.GetDetailedInfo().flash_lso_domain);
262 } 259 }
263 default: 260 default:
264 #if defined(OS_MACOSX) 261 #if defined(OS_MACOSX)
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 child = id_map_.Lookup(node_id); 312 child = id_map_.Lookup(node_id);
316 child_index = parent->GetIndexOf(child); 313 child_index = parent->GetIndexOf(child);
317 if (child_index == -1) 314 if (child_index == -1)
318 break; 315 break;
319 316
320 parent = child; 317 parent = child;
321 } 318 }
322 319
323 return child_index >= 0 ? child : NULL; 320 return child_index >= 0 ? child : NULL;
324 } 321 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/cookies_list.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698