chrome/browser/ui/views/cookie_info_view.cc - Issue 10694093: Remove the force_session cookie option, as it's not used anymore

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/cookie_info_view.cc

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:

Index: chrome/browser/ui/views/cookie_info_view.cc

diff --git a/chrome/browser/ui/views/cookie_info_view.cc b/chrome/browser/ui/views/cookie_info_view.cc

index 758acf8a081924487271347f3c898b835784d774..0b930d2eb6433cd77370c4de2c5fcad32a6a7831 100644

--- a/chrome/browser/ui/views/cookie_info_view.cc

+++ b/chrome/browser/ui/views/cookie_info_view.cc

@@ -68,13 +68,13 @@ void CookieInfoView::SetCookie(

created_value_field_->SetText(

base::TimeFormatFriendlyDateAndTime(cookie.CreationDate()));

- string16 expire_text = cookie.DoesExpire() ?

+ string16 expire_text = cookie.IsPersistent() ?

base::TimeFormatFriendlyDateAndTime(cookie.ExpiryDate()) :

l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_EXPIRES_SESSION);

if (editable_expiration_date_) {

expire_combo_values_.clear();

- if (cookie.DoesExpire())

+ if (cookie.IsPersistent())

expire_combo_values_.push_back(expire_text);

expire_combo_values_.push_back(

l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_EXPIRES_SESSION));