CustomButton cleanup: make protected members private, create accessors

ui/views/controls/scrollbar/native_scroll_bar_views.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/views/controls/scrollbar/native_scroll_bar_views.h"
 
 #include "base/logging.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/path.h"
@@ skipping 78 matching lines @@
   gfx::Rect bounds(GetPreferredSize());
   GetNativeTheme()->Paint(canvas->sk_canvas(), GetNativeThemePart(),
                           GetNativeThemeState(), bounds,
                           GetNativeThemeParams());
 }
 
 ui::NativeTheme::ExtraParams
     ScrollBarButton::GetNativeThemeParams() const {
   ui::NativeTheme::ExtraParams params;
 
-  switch (state_) {
+  switch (state()) {
     case CustomButton::STATE_HOVERED:
       params.scrollbar_arrow.is_hovering = true;
       break;
     default:
       params.scrollbar_arrow.is_hovering = false;
       break;
   }
 
   return params;
 }
 
 ui::NativeTheme::Part
     ScrollBarButton::GetNativeThemePart() const {
   switch (type_) {
     case UP:
       return ui::NativeTheme::kScrollbarUpArrow;
     case DOWN:
       return ui::NativeTheme::kScrollbarDownArrow;
     case LEFT:
       return ui::NativeTheme::kScrollbarLeftArrow;
     case RIGHT:
       return ui::NativeTheme::kScrollbarRightArrow;
     default:
       return ui::NativeTheme::kScrollbarUpArrow;
   }
 }
 
 ui::NativeTheme::State
     ScrollBarButton::GetNativeThemeState() const {
-  ui::NativeTheme::State state;
-
-  switch (state_) {
+  switch (state()) {
     case CustomButton::STATE_HOVERED:
-      state = ui::NativeTheme::kHovered;
-      break;
+      return ui::NativeTheme::kHovered;
     case CustomButton::STATE_PRESSED:
-      state = ui::NativeTheme::kPressed;
-      break;
+      return ui::NativeTheme::kPressed;
     case CustomButton::STATE_DISABLED:
-      state = ui::NativeTheme::kDisabled;
-      break;
+      return ui::NativeTheme::kDisabled;
     case CustomButton::STATE_NORMAL:
     default:
-      state = ui::NativeTheme::kNormal;
-      break;
+      return ui::NativeTheme::kNormal;
   }
-
-  return state;
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // ScrollBarThumb
 
 ScrollBarThumb::ScrollBarThumb(BaseScrollBar* scroll_bar)
     : BaseScrollBarThumb(scroll_bar),
       scroll_bar_(scroll_bar) {
   SetFocusable(false);
   SetAccessibilityFocusable(false);
@@ skipping 32 matching lines @@
   return params;
 }
 
 ui::NativeTheme::Part ScrollBarThumb::GetNativeThemePart() const {
   if (scroll_bar_->IsHorizontal())
     return ui::NativeTheme::kScrollbarHorizontalThumb;
   return ui::NativeTheme::kScrollbarVerticalThumb;
 }
 
 ui::NativeTheme::State ScrollBarThumb::GetNativeThemeState() const {
-  ui::NativeTheme::State state;
-
   switch (GetState()) {
     case CustomButton::STATE_HOVERED:
-      state = ui::NativeTheme::kHovered;
-      break;
+      return ui::NativeTheme::kHovered;
     case CustomButton::STATE_PRESSED:
-      state = ui::NativeTheme::kPressed;
-      break;
+      return ui::NativeTheme::kPressed;
     case CustomButton::STATE_DISABLED:
-      state = ui::NativeTheme::kDisabled;
-      break;
+      return ui::NativeTheme::kDisabled;
     case CustomButton::STATE_NORMAL:
     default:

[sadrul, 2015/12/21 22:05:32]

Maybe remove default, and add a NOTREACHED() for STATE_COUNT instead? (ditto for
line ~137 above)

[Evan Stade, 2015/12/21 22:27:16]

Done.

-      state = ui::NativeTheme::kNormal;
-      break;
+      return ui::NativeTheme::kNormal;
   }
-
-  return state;
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeScrollBarViews, public:
 
 const char NativeScrollBarViews::kViewClassName[] = "NativeScrollBarViews";
 
 NativeScrollBarViews::NativeScrollBarViews(NativeScrollBar* scroll_bar)
@@ skipping 178 matching lines @@
   thumb_params.scrollbar_thumb.is_hovering = false;
   gfx::Size track_size = theme->GetPartSize(
       ui::NativeTheme::kScrollbarVerticalThumb,
       ui::NativeTheme::kNormal,
       thumb_params);
 
   return std::max(track_size.width(), button_size.width());
 }
 
 }  // namespace views