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

Side by Side Diff: chrome/browser/ui/cocoa/content_settings/cookie_details.mm

Issue 10694093: Remove the force_session cookie option, as it's not used anymore (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch for landing Created 8 years, 5 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 // 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/cocoa/content_settings/cookie_details.h" 5 #include "chrome/browser/ui/cocoa/content_settings/cookie_details.h"
6 6
7 #import "base/i18n/time_formatting.h" 7 #import "base/i18n/time_formatting.h"
8 #include "base/sys_string_conversions.h" 8 #include "base/sys_string_conversions.h"
9 #include "grit/generated_resources.h" 9 #include "grit/generated_resources.h"
10 #include "chrome/browser/cookies_tree_model.h" 10 #include "chrome/browser/cookies_tree_model.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 type_ = kCocoaCookieDetailsTypeFolder; 114 type_ = kCocoaCookieDetailsTypeFolder;
115 } 115 }
116 return self; 116 return self;
117 } 117 }
118 118
119 - (id)initWithCookie:(const net::CookieMonster::CanonicalCookie*)cookie 119 - (id)initWithCookie:(const net::CookieMonster::CanonicalCookie*)cookie
120 origin:(NSString*)origin 120 origin:(NSString*)origin
121 canEditExpiration:(BOOL)canEditExpiration { 121 canEditExpiration:(BOOL)canEditExpiration {
122 if ((self = [super init])) { 122 if ((self = [super init])) {
123 type_ = kCocoaCookieDetailsTypeCookie; 123 type_ = kCocoaCookieDetailsTypeCookie;
124 hasExpiration_ = cookie->DoesExpire(); 124 hasExpiration_ = cookie->IsPersistent();
125 canEditExpiration_ = canEditExpiration && hasExpiration_; 125 canEditExpiration_ = canEditExpiration && hasExpiration_;
126 name_.reset([base::SysUTF8ToNSString(cookie->Name()) retain]); 126 name_.reset([base::SysUTF8ToNSString(cookie->Name()) retain]);
127 content_.reset([base::SysUTF8ToNSString(cookie->Value()) retain]); 127 content_.reset([base::SysUTF8ToNSString(cookie->Value()) retain]);
128 path_.reset([base::SysUTF8ToNSString(cookie->Path()) retain]); 128 path_.reset([base::SysUTF8ToNSString(cookie->Path()) retain]);
129 domain_.reset([origin retain]); 129 domain_.reset([origin retain]);
130 130
131 if (cookie->DoesExpire()) { 131 if (cookie->IsPersistent()) {
132 expires_.reset([base::SysUTF16ToNSString( 132 expires_.reset([base::SysUTF16ToNSString(
133 base::TimeFormatFriendlyDateAndTime(cookie->ExpiryDate())) retain]); 133 base::TimeFormatFriendlyDateAndTime(cookie->ExpiryDate())) retain]);
134 } else { 134 } else {
135 expires_.reset([l10n_util::GetNSStringWithFixup( 135 expires_.reset([l10n_util::GetNSStringWithFixup(
136 IDS_COOKIES_COOKIE_EXPIRES_SESSION) retain]); 136 IDS_COOKIES_COOKIE_EXPIRES_SESSION) retain]);
137 } 137 }
138 138
139 created_.reset([base::SysUTF16ToNSString( 139 created_.reset([base::SysUTF16ToNSString(
140 base::TimeFormatFriendlyDateAndTime(cookie->CreationDate())) retain]); 140 base::TimeFormatFriendlyDateAndTime(cookie->CreationDate())) retain]);
141 141
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 details_.reset([details retain]); 293 details_.reset([details retain]);
294 } 294 }
295 return self; 295 return self;
296 } 296 }
297 297
298 - (CocoaCookieDetails*)details { 298 - (CocoaCookieDetails*)details {
299 return details_.get(); 299 return details_.get();
300 } 300 }
301 301
302 @end 302 @end
OLDNEW
« no previous file with comments | « chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc ('k') | chrome/browser/ui/gtk/gtk_chrome_cookie_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698