Lots of random cleanups, mostly for native_theme_win.cc:

ui/native_theme/native_theme_aura.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/native_theme/native_theme_aura.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
@@ skipping 11 matching lines @@
 #include "ui/native_theme/native_theme_switches.h"
 
 using gfx::NineImagePainter;
 
 #define EMPTY_IMAGE_GRID { 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 
 namespace ui {
 
 namespace {
 
-const int kScrollbarThumbImages[NativeTheme::kMaxState][9] = {
+const int kScrollbarThumbImages[NativeTheme::kNumStates][9] = {
   EMPTY_IMAGE_GRID,
   IMAGE_GRID(IDR_SCROLLBAR_THUMB_BASE_HOVER),
   IMAGE_GRID(IDR_SCROLLBAR_THUMB_BASE_NORMAL),
   IMAGE_GRID(IDR_SCROLLBAR_THUMB_BASE_PRESSED)
 };
 
-const int kScrollbarArrowButtonImages[NativeTheme::kMaxState][9] = {
+const int kScrollbarArrowButtonImages[NativeTheme::kNumStates][9] = {
   EMPTY_IMAGE_GRID,
   IMAGE_GRID(IDR_SCROLLBAR_ARROW_BUTTON_BASE_HOVER),
   IMAGE_GRID(IDR_SCROLLBAR_ARROW_BUTTON_BASE_NORMAL),
   IMAGE_GRID(IDR_SCROLLBAR_ARROW_BUTTON_BASE_PRESSED)
 };
 
-const uint8 kScrollbarOverlayThumbFillAlphas[NativeTheme::kMaxState] = {
+const uint8 kScrollbarOverlayThumbFillAlphas[NativeTheme::kNumStates] = {
   0,    // Does not matter, will not paint for disabled state.
   178,  // Hover state, opacity 70%, alpha would be 0.7 * 255.
   140,  // Normal state, opacity 55%, alpha would be 0.55 * 255.
   178   // Pressed state, opacity 70%, alpha would be 0.7 * 255.
 };
 
-const uint8 kScrollbarOverlayThumbStrokeAlphas[NativeTheme::kMaxState] = {
+const uint8 kScrollbarOverlayThumbStrokeAlphas[NativeTheme::kNumStates] = {
   0,   // Does not matter, will not paint for disabled state.
   51,  // Hover state, opacity 20%, alpha would be 0.2 * 255.
   38,  // Normal state, opacity 15%, alpha would be 0.15 * 255.
   51   // Pressed state, opacity 20%, alpha would be 0.2 * 255.
 };
 
 const int kScrollbarOverlayThumbStrokeImages[9] =
     IMAGE_GRID_NO_CENTER(IDR_SCROLLBAR_OVERLAY_THUMB_STROKE);
 
 const int kScrollbarOverlayThumbFillImages[9] =
@@ skipping 16 matching lines @@
 }
 #endif
 
 NativeThemeAura::NativeThemeAura() {
   // We don't draw scrollbar buttons.
 #if defined(OS_CHROMEOS)
   set_scrollbar_button_length(0);
 #endif
 
   // Images and alphas declarations assume the following order.
-  COMPILE_ASSERT(kDisabled == 0, states_unexepctedly_changed);
-  COMPILE_ASSERT(kHovered == 1, states_unexepctedly_changed);
-  COMPILE_ASSERT(kNormal == 2, states_unexepctedly_changed);
-  COMPILE_ASSERT(kPressed == 3, states_unexepctedly_changed);
-  COMPILE_ASSERT(kMaxState == 4, states_unexepctedly_changed);
+  COMPILE_ASSERT(kDisabled == 0, states_unexpectedly_changed);
+  COMPILE_ASSERT(kHovered == 1, states_unexpectedly_changed);
+  COMPILE_ASSERT(kNormal == 2, states_unexpectedly_changed);
+  COMPILE_ASSERT(kPressed == 3, states_unexpectedly_changed);
 }
 
 NativeThemeAura::~NativeThemeAura() {
 }
 
 void NativeThemeAura::PaintMenuPopupBackground(
     SkCanvas* canvas,
     const gfx::Size& size,
     const MenuBackgroundExtraParams& menu_background) const {
   SkColor color = GetSystemColor(NativeTheme::kColorId_MenuBackgroundColor);
@@ skipping 133 matching lines @@
   // Overlay Scrollbar should never paint a scrollbar corner.
   DCHECK(!IsOverlayScrollbarEnabled());
   SkPaint paint;
   paint.setColor(SkColorSetRGB(0xF1, 0xF1, 0xF1));
   paint.setStyle(SkPaint::kFill_Style);
   paint.setXfermodeMode(SkXfermode::kSrc_Mode);
   canvas->drawIRect(RectToSkIRect(rect), paint);
 }
 
 NineImagePainter* NativeThemeAura::GetOrCreatePainter(
-    const int images[kMaxState][9],
+    const int images[kNumStates][9],
     State state,
-    scoped_ptr<NineImagePainter> painters[kMaxState]) const {
+    scoped_ptr<NineImagePainter> painters[kNumStates]) const {
   if (painters[state])
     return painters[state].get();
   if (images[state][0] == 0) {
     // Must always provide normal state images.
     DCHECK_NE(kNormal, state);
     return GetOrCreatePainter(images, kNormal, painters);
   }
   painters[state] = CreateNineImagePainter(images[state]);
   return painters[state].get();
 }
 
 void NativeThemeAura::PaintPainter(NineImagePainter* painter,
                                    SkCanvas* sk_canvas,
                                    const gfx::Rect& rect) const {
   DCHECK(painter);
   scoped_ptr<gfx::Canvas> canvas(CommonThemeCreateCanvas(sk_canvas));
   painter->Paint(canvas.get(), rect);
 }
 
 scoped_ptr<NativeThemeAura::DualPainter> NativeThemeAura::CreateDualPainter(
     const int fill_image_ids[9],
-    const uint8 fill_alphas[kMaxState],
+    const uint8 fill_alphas[kNumStates],
     const int stroke_image_ids[9],
-    const uint8 stroke_alphas[kMaxState]) const {
+    const uint8 stroke_alphas[kNumStates]) const {
   scoped_ptr<NativeThemeAura::DualPainter> dual_painter(
       new NativeThemeAura::DualPainter(CreateNineImagePainter(fill_image_ids),
                                        fill_alphas,
                                        CreateNineImagePainter(stroke_image_ids),
                                        stroke_alphas));
   return dual_painter.Pass();
 }
 
 void NativeThemeAura::PaintDualPainter(
     NativeThemeAura::DualPainter* dual_painter,
@@ skipping 25 matching lines @@
                        (dual_painter->stroke_alphas[endState] -
                         dual_painter->stroke_alphas[startState]) *
                            progress;
 
   dual_painter->fill_painter->Paint(canvas.get(), rect, fill_alpha);
   dual_painter->stroke_painter->Paint(canvas.get(), rect, stroke_alpha);
 }
 
 NativeThemeAura::DualPainter::DualPainter(
     scoped_ptr<NineImagePainter> fill_painter,
-    const uint8 fill_alphas[kMaxState],
+    const uint8 fill_alphas[kNumStates],
     scoped_ptr<NineImagePainter> stroke_painter,
-    const uint8 stroke_alphas[kMaxState])
+    const uint8 stroke_alphas[kNumStates])
     : fill_painter(fill_painter.Pass()),
       fill_alphas(fill_alphas),
       stroke_painter(stroke_painter.Pass()),
       stroke_alphas(stroke_alphas) {}
 
 NativeThemeAura::DualPainter::~DualPainter() {}
 
 }  // namespace ui