chrome/browser/extensions/api/content_settings/content_settings_helpers.cc - Issue 815363002: replace COMPILE_ASSERT with static_assert in chrome/browser/

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/extensions/api/content_settings/content_settings_helpers.cc

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

Patch Set: address comments 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 | « chrome/browser/extensions/api/alarms/alarms_api.cc ('k') | chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/content_settings/content_settings_helpers.cc

diff --git a/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc b/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc

index 6601abdb2debdd836562cd853adaa5115786ef58..7fc2e85b19240e12a35932715258d17e036cefde 100644

--- a/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc

+++ b/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc

@@ -26,9 +26,9 @@ const char* const kContentSettingsTypeNames[] = {

"location",

"notifications",

};

-COMPILE_ASSERT(arraysize(kContentSettingsTypeNames) <=

- CONTENT_SETTINGS_NUM_TYPES,

- content_settings_type_names_size_invalid);

+static_assert(arraysize(kContentSettingsTypeNames) <=

+ CONTENT_SETTINGS_NUM_TYPES,

+ "kContentSettingsTypeNames has an unexpected number of elements");

const char* const kContentSettingNames[] = {

"default",

@@ -37,9 +37,9 @@ const char* const kContentSettingNames[] = {

"ask",

"session_only",

};

-COMPILE_ASSERT(arraysize(kContentSettingNames) <=

- CONTENT_SETTING_NUM_SETTINGS,

- content_setting_names_size_invalid);

+static_assert(arraysize(kContentSettingNames) <=

+ CONTENT_SETTING_NUM_SETTINGS,

+ "kContentSettingNames has an unexpected number of elements");

// TODO(bauerb): Move this someplace where it can be reused.

std::string GetDefaultPort(const std::string& scheme) {