Further polish for the Origin Info Bubble.
Simplify the view of cookies into a single line in the display, per UX team.
BUG=444244
Review URL: https://codereview.chromium.org/1113253002
Cr-Commit-Position: refs/heads/master@{#346278}
diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc
index d18e1f7..4cf012c 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -46,7 +46,6 @@
#include "content/public/common/content_switches.h"
#include "content/public/common/ssl_status.h"
#include "content/public/common/url_constants.h"
-#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
#include "net/cert/cert_status_flags.h"
#include "net/cert/x509_certificate.h"
#include "net/ssl/ssl_cipher_suite_names.h"
@@ -691,15 +690,11 @@
// Add first party cookie and site data counts.
WebsiteSettingsUI::CookieInfo cookie_info;
- std::string cookie_source =
- net::registry_controlled_domains::GetDomainAndRegistry(
- site_url_,
- net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
- if (cookie_source.empty())
- cookie_source = site_url_.host();
- cookie_info.cookie_source = cookie_source;
+ cookie_info.cookie_source =
+ l10n_util::GetStringUTF8(IDS_WEBSITE_SETTINGS_FIRST_PARTY_SITE_DATA);
cookie_info.allowed = allowed_objects.GetObjectCountForDomain(site_url_);
cookie_info.blocked = blocked_objects.GetObjectCountForDomain(site_url_);
+ cookie_info.is_first_party = true;
cookie_info_list.push_back(cookie_info);
// Add third party cookie counts.
@@ -707,6 +702,7 @@
IDS_WEBSITE_SETTINGS_THIRD_PARTY_SITE_DATA);
cookie_info.allowed = allowed_objects.GetObjectCount() - cookie_info.allowed;
cookie_info.blocked = blocked_objects.GetObjectCount() - cookie_info.blocked;
+ cookie_info.is_first_party = false;
cookie_info_list.push_back(cookie_info);
ui_->SetCookieInfo(cookie_info_list);
