Lots of random cleanups, mostly for native_theme_win.cc:

ui/views/controls/button/button.cc

Index: ui/views/controls/button/button.cc
diff --git a/ui/views/controls/button/button.cc b/ui/views/controls/button/button.cc
index 4e7f51b545063f0193425184d0fbcdbf16e8fe22..b9b8b22ab03542119ad079ff21ea64bd9a032fd8 100644
--- a/ui/views/controls/button/button.cc
+++ b/ui/views/controls/button/button.cc
@@ -15,11 +15,11 @@ namespace views {
 // static
 Button::ButtonState Button::GetButtonStateFrom(ui::NativeTheme::State state) {
   switch (state) {
-    case ui::NativeTheme::kDisabled: return Button::STATE_DISABLED;
-    case ui::NativeTheme::kHovered:  return Button::STATE_HOVERED;
-    case ui::NativeTheme::kNormal:   return Button::STATE_NORMAL;
-    case ui::NativeTheme::kPressed:  return Button::STATE_PRESSED;
-    case ui::NativeTheme::kMaxState: NOTREACHED() << "Unknown state: " << state;
+    case ui::NativeTheme::kDisabled:  return Button::STATE_DISABLED;
+    case ui::NativeTheme::kHovered:   return Button::STATE_HOVERED;
+    case ui::NativeTheme::kNormal:    return Button::STATE_NORMAL;
+    case ui::NativeTheme::kPressed:   return Button::STATE_PRESSED;
+    case ui::NativeTheme::kNumStates: NOTREACHED();
   }
   return Button::STATE_NORMAL;
 }