| 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/views/cookie_info_view.h" | 5 #include "chrome/browser/ui/views/cookie_info_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/i18n/time_formatting.h" | 9 #include "base/i18n/time_formatting.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 void CookieInfoView::SetCookie( | 61 void CookieInfoView::SetCookie( |
| 62 const std::string& domain, | 62 const std::string& domain, |
| 63 const net::CookieMonster::CanonicalCookie& cookie) { | 63 const net::CookieMonster::CanonicalCookie& cookie) { |
| 64 name_value_field_->SetText(UTF8ToUTF16(cookie.Name())); | 64 name_value_field_->SetText(UTF8ToUTF16(cookie.Name())); |
| 65 content_value_field_->SetText(UTF8ToUTF16(cookie.Value())); | 65 content_value_field_->SetText(UTF8ToUTF16(cookie.Value())); |
| 66 domain_value_field_->SetText(UTF8ToUTF16(domain)); | 66 domain_value_field_->SetText(UTF8ToUTF16(domain)); |
| 67 path_value_field_->SetText(UTF8ToUTF16(cookie.Path())); | 67 path_value_field_->SetText(UTF8ToUTF16(cookie.Path())); |
| 68 created_value_field_->SetText( | 68 created_value_field_->SetText( |
| 69 base::TimeFormatFriendlyDateAndTime(cookie.CreationDate())); | 69 base::TimeFormatFriendlyDateAndTime(cookie.CreationDate())); |
| 70 | 70 |
| 71 string16 expire_text = cookie.DoesExpire() ? | 71 string16 expire_text = cookie.IsPersistent() ? |
| 72 base::TimeFormatFriendlyDateAndTime(cookie.ExpiryDate()) : | 72 base::TimeFormatFriendlyDateAndTime(cookie.ExpiryDate()) : |
| 73 l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_EXPIRES_SESSION); | 73 l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_EXPIRES_SESSION); |
| 74 | 74 |
| 75 if (editable_expiration_date_) { | 75 if (editable_expiration_date_) { |
| 76 expire_combo_values_.clear(); | 76 expire_combo_values_.clear(); |
| 77 if (cookie.DoesExpire()) | 77 if (cookie.IsPersistent()) |
| 78 expire_combo_values_.push_back(expire_text); | 78 expire_combo_values_.push_back(expire_text); |
| 79 expire_combo_values_.push_back( | 79 expire_combo_values_.push_back( |
| 80 l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_EXPIRES_SESSION)); | 80 l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_EXPIRES_SESSION)); |
| 81 expires_value_combobox_->ModelChanged(); | 81 expires_value_combobox_->ModelChanged(); |
| 82 expires_value_combobox_->SetSelectedIndex(0); | 82 expires_value_combobox_->SetSelectedIndex(0); |
| 83 expires_value_combobox_->SetEnabled(true); | 83 expires_value_combobox_->SetEnabled(true); |
| 84 expires_value_combobox_->set_listener(this); | 84 expires_value_combobox_->set_listener(this); |
| 85 } else { | 85 } else { |
| 86 expires_value_field_->SetText(expire_text); | 86 expires_value_field_->SetText(expire_text); |
| 87 } | 87 } |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 send_for_value_field_->SetBackgroundColor(text_area_background); | 276 send_for_value_field_->SetBackgroundColor(text_area_background); |
| 277 created_value_field_->SetReadOnly(true); | 277 created_value_field_->SetReadOnly(true); |
| 278 created_value_field_->RemoveBorder(); | 278 created_value_field_->RemoveBorder(); |
| 279 created_value_field_->SetBackgroundColor(text_area_background); | 279 created_value_field_->SetBackgroundColor(text_area_background); |
| 280 if (expires_value_field_) { | 280 if (expires_value_field_) { |
| 281 expires_value_field_->SetReadOnly(true); | 281 expires_value_field_->SetReadOnly(true); |
| 282 expires_value_field_->RemoveBorder(); | 282 expires_value_field_->RemoveBorder(); |
| 283 expires_value_field_->SetBackgroundColor(text_area_background); | 283 expires_value_field_->SetBackgroundColor(text_area_background); |
| 284 } | 284 } |
| 285 } | 285 } |
| OLD | NEW |