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..d5f34c1c639d300efc8ca508e8fb39d8f12b6c65 100644
--- a/ui/views/controls/button/button.cc
+++ b/ui/views/controls/button/button.cc
@@ -19,9 +19,8 @@ Button::ButtonState Button::GetButtonStateFrom(ui::NativeTheme::State state) {
     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;
+    default:                         NOTREACHED(); return Button::STATE_NORMAL;

[sky, 2014/07/10 16:05:39]

Same comment here about compile error.

[Peter Kasting, 2014/07/10 18:23:15]

See reply on other comment.

[Peter Kasting, 2014/07/10 21:44:25]

Changed this.

   }
-  return Button::STATE_NORMAL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////