components/content_settings/core/browser/host_content_settings_map.cc - Issue 1963203002: [Chrome Settings UI] Show overruled User Exceptions as strike-through.

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: components/content_settings/core/browser/host_content_settings_map.cc

Issue 1963203002: [Chrome Settings UI] Show overruled User Exceptions as strike-through. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Move common code to appendIndicatorElement(). Created 4 years, 7 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/resources/options/content_settings_exceptions_area.js ('K') | « components/content_settings/core/browser/host_content_settings_map.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/browser/host_content_settings_map.cc

diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc

index 67321bd14d92e837c430cad08ea72eb808450eb9..275e2abd299bde225ef7c17859e96de5d6d4c5de 100644

--- a/components/content_settings/core/browser/host_content_settings_map.cc

+++ b/components/content_settings/core/browser/host_content_settings_map.cc

@@ -267,15 +267,6 @@ ContentSetting HostContentSettingsMap::GetDefaultContentSetting(

return content_setting;

}

-bool HostContentSettingsMap::AreUserExceptionsAllowedForType(

- ContentSettingsType content_type) const {

- ProviderType default_provider_type = NUM_PROVIDER_TYPES;

- ContentSetting content_setting =

- GetDefaultContentSettingInternal(content_type, &default_provider_type);

- DCHECK_NE(CONTENT_SETTING_DEFAULT, content_setting);

- return default_provider_type >= PREF_PROVIDER;

ContentSetting HostContentSettingsMap::GetContentSetting(

const GURL& primary_url,

const GURL& secondary_url,