| 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 c449eef47b52b3c00ed4889897b676daffc09c07..991b0e30cb872d8dce022f21ede27c5add05a93e 100644
|
| --- a/chrome/browser/ui/views/cookie_info_view.cc
|
| +++ b/chrome/browser/ui/views/cookie_info_view.cc
|
| @@ -14,6 +14,7 @@
|
| #include "chrome/browser/cookies_tree_model.h"
|
| #include "grit/generated_resources.h"
|
| #include "grit/locale_settings.h"
|
| +#include "net/cookies/canonical_cookie.h"
|
| #include "net/cookies/parsed_cookie.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/gfx/canvas.h"
|
| @@ -59,9 +60,8 @@ CookieInfoView::CookieInfoView(bool editable_expiration_date)
|
| CookieInfoView::~CookieInfoView() {
|
| }
|
|
|
| -void CookieInfoView::SetCookie(
|
| - const std::string& domain,
|
| - const net::CookieMonster::CanonicalCookie& cookie) {
|
| +void CookieInfoView::SetCookie(const std::string& domain,
|
| + const net::CanonicalCookie& cookie) {
|
| name_value_field_->SetText(UTF8ToUTF16(cookie.Name()));
|
| content_value_field_->SetText(UTF8ToUTF16(cookie.Value()));
|
| domain_value_field_->SetText(UTF8ToUTF16(domain));
|
| @@ -97,7 +97,7 @@ void CookieInfoView::SetCookie(
|
| void CookieInfoView::SetCookieString(const GURL& url,
|
| const std::string& cookie_line) {
|
| net::ParsedCookie pc(cookie_line);
|
| - net::CookieMonster::CanonicalCookie cookie(url, pc);
|
| + net::CanonicalCookie cookie(url, pc);
|
| SetCookie(pc.HasDomain() ? pc.Domain() : url.host(), cookie);
|
| }
|
|
|
|
|