Display third party cookies and site data counts in the WebsiteSettings UI.

chrome/browser/website_settings.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/website_settings.h"
 
 #include <string>
 #include <vector>
 
 #include "base/string_number_conversions.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/website_settings_ui.h"
 #include "chrome/common/content_settings_pattern.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cert_store.h"
 #include "content/public/common/ssl_status.h"
 #include "content/public/common/url_constants.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "net/base/cert_status_flags.h"
+#include "net/base/registry_controlled_domain.h"
 #include "net/base/ssl_cipher_suite_names.h"
 #include "net/base/ssl_connection_status_flags.h"
 #include "net/base/x509_certificate.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(TOOLKIT_GTK)
 #include "chrome/browser/ui/gtk/website_settings_popup_gtk.h"
 #endif
 
 using content::BrowserThread;
 
 namespace {
 
 ContentSettingsType kPermissionType[] = {
   CONTENT_SETTINGS_TYPE_POPUPS,
   CONTENT_SETTINGS_TYPE_PLUGINS,
   CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
   CONTENT_SETTINGS_TYPE_GEOLOCATION,
 };
 
-size_t GetLocalStoredObjectCount(
-    const LocalSharedObjectsContainer& local_shared_objects) {
-  size_t count = 0;
-  count += local_shared_objects.cookies()->GetCookieCount();
-  count += local_shared_objects.databases()->GetDatabaseCount();
-  count += local_shared_objects.file_systems()->GetFileSystemCount();
-  count += local_shared_objects.indexed_dbs()->GetIndexedDBCount();
-  count += local_shared_objects.local_storages()->GetLocalStorageCount();
-  count += local_shared_objects.server_bound_certs()->GetCertCount();
-  count += local_shared_objects.session_storages()->GetLocalStorageCount();
-  return count;
-}
-
 }  // namespace
 
 WebsiteSettings::WebsiteSettings(
     WebsiteSettingsUI* ui,
     Profile* profile,
     TabSpecificContentSettings* tab_specific_content_settings,
     const GURL& url,
     const content::SSLStatus& ssl,
     content::CertStore* cert_store)
     : TabSpecificContentSettings::SiteDataObserver(
@@ skipping 328 matching lines @@
       }
       permission_info_list.push_back(permission_info);
     }
   }
 
   ui_->SetPermissionInfo(permission_info_list);
 }
 
 void WebsiteSettings::PresentSiteData() {
   CookieInfoList cookie_info_list;
+  const LocalSharedObjectsContainer& allowed_objects =
+      tab_specific_content_settings()->allowed_local_shared_objects();
+  const LocalSharedObjectsContainer& blocked_objects =
+      tab_specific_content_settings()->blocked_local_shared_objects();
+
+  // Add first party cookie and site data counts.
   WebsiteSettingsUI::CookieInfo cookie_info;
-  cookie_info.cookie_source = site_url_.host();
-  cookie_info.allowed = GetLocalStoredObjectCount(
-      tab_specific_content_settings()->allowed_local_shared_objects());
-  cookie_info.blocked = GetLocalStoredObjectCount(
-      tab_specific_content_settings()->blocked_local_shared_objects());
+  std::string cookie_source =
+      net::RegistryControlledDomainService::GetDomainAndRegistry(site_url_);

[bauerb at google, 2012/04/27 16:12:50]

Doesn't SameDomainOrHost() do this internally?

[markusheintz_, 2012/05/10 16:32:36]

Yes it does.

Here I need to get the domain of the URL in order to display it in the UI.

+  if (cookie_source.empty())
+    cookie_source = site_url_.host();
+  cookie_info.cookie_source = cookie_source;
+  cookie_info.allowed = allowed_objects.GetObjectCountForDomain(site_url_);
+  cookie_info.blocked = blocked_objects.GetObjectCountForDomain(site_url_);
+  cookie_info_list.push_back(cookie_info);
+
+  // Add third party cookie counts.
+  // TODO(markusheintz): Localize the following string once we decided about
+  // the exact wording.

[bauerb at google, 2012/04/27 16:12:50]

Usually, we add strings to the GRD file even if they haven't been finalized yet.

[markusheintz_, 2012/05/10 16:32:36]

Done.

+  cookie_info.cookie_source = "Others";
+  cookie_info.allowed = allowed_objects.Size() - cookie_info.allowed;
+  cookie_info.blocked = blocked_objects.Size() - cookie_info.blocked;
   cookie_info_list.push_back(cookie_info);
 
   ui_->SetCookieInfo(cookie_info_list);
 }
 
 void WebsiteSettings::PresentSiteIdentity() {
   // After initialization the status about the site's connection
   // and it's identity must be available.
   DCHECK_NE(site_identity_status_, SITE_IDENTITY_STATUS_UNKNOWN);
   DCHECK_NE(site_connection_status_, SITE_CONNECTION_STATUS_UNKNOWN);
@@ skipping 23 matching lines @@
   new WebsiteSettings(new WebsiteSettingsPopupGtk(parent,
                                                   profile,
                                                   tab_contents_wrapper),
                       profile,
                       tab_contents_wrapper->content_settings(),
                       url,
                       ssl,
                       content::CertStore::GetInstance());
 #endif
 }