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

Unified Diff: ui/native_theme/native_theme_mac.mm

Issue 828633002: replace COMPILE_ASSERT with static_assert in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix for rebase 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
« no previous file with comments | « ui/native_theme/native_theme_aura.cc ('k') | ui/platform_window/x11/x11_window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/native_theme/native_theme_mac.mm
diff --git a/ui/native_theme/native_theme_mac.mm b/ui/native_theme/native_theme_mac.mm
index 6b87f57161a8e8375dbdcaf74c90d0992f2887d2..7c9a156797ccc9e25c4026eb6bba1ac7957eb7bf 100644
--- a/ui/native_theme/native_theme_mac.mm
+++ b/ui/native_theme/native_theme_mac.mm
@@ -56,7 +56,7 @@ SkColor GetSystemColorUsingSwatch(NSColor* color) {
base::ScopedCFTypeRef<CGColorSpaceRef> color_space(
CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB));
const size_t bytes_per_row = 4;
- COMPILE_ASSERT(sizeof(swatch) == bytes_per_row, skcolor_not_4_bytes);
+ static_assert(sizeof(swatch) == bytes_per_row, "skcolor should be 4 bytes");
CGBitmapInfo bitmap_info =
kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host;
base::ScopedCFTypeRef<CGContextRef> context(CGBitmapContextCreate(
« no previous file with comments | « ui/native_theme/native_theme_aura.cc ('k') | ui/platform_window/x11/x11_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698