components/content_settings/core/browser/content_settings_policy_provider.cc - Issue 794683005: replace COMPILE_ASSERT with static_assert in components/

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

Issue 794683005: replace COMPILE_ASSERT with static_assert in components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: formatting fixup Created 6 years 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

« no previous file with comments | « components/content_settings/core/browser/content_settings_default_provider.cc ('k') | components/content_settings/core/browser/content_settings_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index e2976070fe837a7faf91ccfcce3854c5383edfa6..638b29db0393e564184df46fe7b86e25238526ea 100644

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

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

@@ -50,8 +50,9 @@ const char* kPrefToManageType[] = {

NULL, // No policy for default value of app banners

#endif

};

-COMPILE_ASSERT(arraysize(kPrefToManageType) == CONTENT_SETTINGS_NUM_TYPES,

- managed_content_settings_pref_names_array_size_incorrect);

+static_assert(arraysize(kPrefToManageType) == CONTENT_SETTINGS_NUM_TYPES,

+ "kPrefToManageType should have CONTENT_SETTINGS_NUM_TYPES "

+ "elements");

struct PrefsForManagedContentSettingsMapEntry {

const char* pref_name;