Lots of random cleanups, mostly for native_theme_win.cc:

ui/native_theme/native_theme.h

 // 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.
 
 #ifndef UI_NATIVE_THEME_NATIVE_THEME_H_
 #define UI_NATIVE_THEME_NATIVE_THEME_H_
 
 #include "base/observer_list.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/native_widget_types.h"
@@ skipping 72 matching lines @@
     kMaxPart,
   };
 
   // The state of the part.
   enum State {
     // IDs defined as specific values for use in arrays.
     kDisabled = 0,
     kHovered  = 1,
     kNormal   = 2,
     kPressed  = 3,
-    kMaxState = 4,
+    kNumStates = kPressed + 1,
   };
 
   // Each structure below holds extra information needed when painting a given
   // part.
 
   struct ButtonExtraParams {
     bool checked;
     bool indeterminate;  // Whether the button state is indeterminate.
     bool is_default;  // Whether the button is default button.
     bool is_focused;
@@ skipping 245 matching lines @@
  private:
   // Observers to notify when the native theme changes.
   ObserverList<NativeThemeObserver> native_theme_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeTheme);
 };
 
 }  // namespace ui
 
 #endif  // UI_NATIVE_THEME_NATIVE_THEME_H_