components/content_settings/core/common/content_settings.cc - Issue 884373002: Update content setting for app banners to store more information.

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/common/content_settings.cc

Issue 884373002: Update content setting for app banners to store more information. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Mac test failure Created 5 years, 11 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/banners/app_banner_settings_helper.h ('K') | « components/content_settings/core/browser/host_content_settings_map.cc ('k') | components/content_settings/core/common/content_settings_types.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/common/content_settings.cc

diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc

index f4d9a6d00507422d319e1a0a09f5ca474199699b..00403e909b4c3d4edcec5a656d9d371f327f1821 100644

--- a/components/content_settings/core/common/content_settings.cc

+++ b/components/content_settings/core/common/content_settings.cc

@@ -64,10 +64,8 @@ ContentSettingsTypeHistogram ContentSettingTypeToHistogramValue(

case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:

return CONTENT_SETTINGS_TYPE_HISTOGRAM_PROTECTED_MEDIA_IDENTIFIER;

#endif

-#if defined(OS_ANDROID)

case CONTENT_SETTINGS_TYPE_APP_BANNER:

return CONTENT_SETTINGS_TYPE_HISTOGRAM_APP_BANNER;

-#endif

case CONTENT_SETTINGS_NUM_TYPES:

return CONTENT_SETTINGS_TYPE_HISTOGRAM_INVALID;

}