chrome/browser/ui/website_settings/website_settings.cc - Issue 588583002: LocalSharedObjectsContainer: Separate object counting in an interface

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/website_settings/website_settings.cc

Issue 588583002: LocalSharedObjectsContainer: Separate object counting in an interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/content_settings/tab_specific_content_settings.h ('K') | « chrome/browser/ui/views/collected_cookies_views.cc ('k') | chrome/browser/ui/webui/options/website_settings_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/website_settings/website_settings.cc

diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc

index df26aea09484c37e76fea5372240fc6e2624ec18..08b3e5e897650dbaf5353c639e1bdf1f04d3c2d9 100644

--- a/chrome/browser/ui/website_settings/website_settings.cc

+++ b/chrome/browser/ui/website_settings/website_settings.cc

@@ -24,7 +24,7 @@

#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"

#include "chrome/browser/content_settings/content_settings_utils.h"

#include "chrome/browser/content_settings/host_content_settings_map.h"

-#include "chrome/browser/content_settings/local_shared_objects_container.h"

+#include "chrome/browser/content_settings/local_shared_objects_counter.h"

#include "chrome/browser/history/history_service_factory.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h"

@@ -674,9 +674,9 @@ void WebsiteSettings::PresentSitePermissions() {

void WebsiteSettings::PresentSiteData() {

CookieInfoList cookie_info_list;

- const LocalSharedObjectsContainer& allowed_objects =

+ const LocalSharedObjectsCounter& allowed_objects =

tab_specific_content_settings()->allowed_local_shared_objects();

- const LocalSharedObjectsContainer& blocked_objects =

+ const LocalSharedObjectsCounter& blocked_objects =

tab_specific_content_settings()->blocked_local_shared_objects();

// Add first party cookie and site data counts.