Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2937)

Unified Diff: chrome/browser/ui/website_settings/website_settings_ui.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/ui/views/tabs/tab_drag_controller_interactive_uitest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/website_settings/website_settings_ui.cc
diff --git a/chrome/browser/ui/website_settings/website_settings_ui.cc b/chrome/browser/ui/website_settings/website_settings_ui.cc
index 1bd91680aa23e21cdbbc91093187cc1ddce87431..05e7da8d119db2306cb992a6193524c5643f47e4 100644
--- a/chrome/browser/ui/website_settings/website_settings_ui.cc
+++ b/chrome/browser/ui/website_settings/website_settings_ui.cc
@@ -24,9 +24,9 @@ const int kPermissionButtonTextIDPolicyManaged[] = {
kInvalidResourceID,
kInvalidResourceID,
kInvalidResourceID};
-COMPILE_ASSERT(arraysize(kPermissionButtonTextIDPolicyManaged) ==
- CONTENT_SETTING_NUM_SETTINGS,
- button_text_id_array_size_incorrect);
+static_assert(arraysize(kPermissionButtonTextIDPolicyManaged) ==
+ CONTENT_SETTING_NUM_SETTINGS,
+ "kPermissionButtonTextIDPolicyManaged array size is incorrect");
// The resource id's for the strings that are displayed on the permissions
// button if the permission setting is managed by an extension.
@@ -37,9 +37,10 @@ const int kPermissionButtonTextIDExtensionManaged[] = {
kInvalidResourceID,
kInvalidResourceID,
kInvalidResourceID};
-COMPILE_ASSERT(arraysize(kPermissionButtonTextIDExtensionManaged) ==
- CONTENT_SETTING_NUM_SETTINGS,
- button_text_id_array_size_incorrect);
+static_assert(arraysize(kPermissionButtonTextIDExtensionManaged) ==
+ CONTENT_SETTING_NUM_SETTINGS,
+ "kPermissionButtonTextIDExtensionManaged array size is "
+ "incorrect");
// The resource id's for the strings that are displayed on the permissions
// button if the permission setting is managed by the user.
@@ -50,9 +51,9 @@ const int kPermissionButtonTextIDUserManaged[] = {
kInvalidResourceID,
kInvalidResourceID,
kInvalidResourceID};
-COMPILE_ASSERT(arraysize(kPermissionButtonTextIDUserManaged) ==
- CONTENT_SETTING_NUM_SETTINGS,
- button_text_id_array_size_incorrect);
+static_assert(arraysize(kPermissionButtonTextIDUserManaged) ==
+ CONTENT_SETTING_NUM_SETTINGS,
+ "kPermissionButtonTextIDUserManaged array size is incorrect");
// The resource id's for the strings that are displayed on the permissions
// button if the permission setting is the global default setting.
@@ -63,9 +64,9 @@ const int kPermissionButtonTextIDDefaultSetting[] = {
IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ASK_BY_DEFAULT,
kInvalidResourceID,
IDS_WEBSITE_SETTINGS_BUTTON_TEXT_DETECT_IMPORTANT_CONTENT_BY_DEFAULT};
-COMPILE_ASSERT(arraysize(kPermissionButtonTextIDDefaultSetting) ==
- CONTENT_SETTING_NUM_SETTINGS,
- button_text_id_array_size_incorrect);
+static_assert(arraysize(kPermissionButtonTextIDDefaultSetting) ==
+ CONTENT_SETTING_NUM_SETTINGS,
+ "kPermissionButtonTextIDDefaultSetting array size is incorrect");
} // namespace
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698