MacViews: Overlay Scrollbars with Show/Hide Animations

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 11 matching lines @@
 // Wrapper for the scroll buttons.
 class ScrollBarButton : public BaseScrollBarButton {
  public:
   enum Type {
     UP,
     DOWN,
     LEFT,
     RIGHT,
   };
 
-  ScrollBarButton(ButtonListener* listener, Type type);
+  explicit ScrollBarButton(ButtonListener* listener, Type type);

[tapted, 2016/02/11 08:46:18]

oops - I think we can revert all the diffs in this file. (The ScrollBarThumb
constructor should be explicit, but it's orthogonal to this CL.)

[spqchan, 2016/02/13 01:39:23]

I removed all the diffs involving NativeScrollBar

   ~ScrollBarButton() override;
 
   gfx::Size GetPreferredSize() const override;
   const char* GetClassName() const override { return "ScrollBarButton"; }
 
  protected:
   void OnPaint(gfx::Canvas* canvas) override;
 
  private:
   ui::NativeTheme::ExtraParams GetNativeThemeParams() const;
   ui::NativeTheme::Part GetNativeThemePart() const;
   ui::NativeTheme::State GetNativeThemeState() const;
 
   Type type_;
 };
 
 // Wrapper for the scroll thumb
 class ScrollBarThumb : public BaseScrollBarThumb {
  public:
-  explicit ScrollBarThumb(BaseScrollBar* scroll_bar);
+  ScrollBarThumb(BaseScrollBar* scroll_bar);
   ~ScrollBarThumb() override;
 
   gfx::Size GetPreferredSize() const override;
   const char* GetClassName() const override { return "ScrollBarThumb"; }
 
  protected:
   void OnPaint(gfx::Canvas* canvas) override;
 
  private:
   ui::NativeTheme::ExtraParams GetNativeThemeParams() const;
   ui::NativeTheme::Part GetNativeThemePart() const;
   ui::NativeTheme::State GetNativeThemeState() const;
 
   ScrollBar* scroll_bar_;
 };
 
 /////////////////////////////////////////////////////////////////////////////
 // ScrollBarButton
 
 ScrollBarButton::ScrollBarButton(ButtonListener* listener, Type type)
-    : BaseScrollBarButton(listener),
-      type_(type) {
+    : BaseScrollBarButton(listener), type_(type) {
   SetFocusable(false);
   SetAccessibilityFocusable(false);
 }
 
 ScrollBarButton::~ScrollBarButton() {
 }
 
 gfx::Size ScrollBarButton::GetPreferredSize() const {
   return GetNativeTheme()->GetPartSize(GetNativeThemePart(),
                                        GetNativeThemeState(),
@@ skipping 127 matching lines @@
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeScrollBarViews, public:
 
 const char NativeScrollBarViews::kViewClassName[] = "NativeScrollBarViews";
 
 NativeScrollBarViews::NativeScrollBarViews(NativeScrollBar* scroll_bar)
-    : BaseScrollBar(scroll_bar->IsHorizontal(),
-                    new ScrollBarThumb(this)),
+    : BaseScrollBar(scroll_bar->IsHorizontal(), new ScrollBarThumb(this)),
       native_scroll_bar_(scroll_bar) {
   set_controller(native_scroll_bar_->controller());
 
   if (native_scroll_bar_->IsHorizontal()) {
     prev_button_ = new ScrollBarButton(this, ScrollBarButton::LEFT);
     next_button_ = new ScrollBarButton(this, ScrollBarButton::RIGHT);
 
     part_ = ui::NativeTheme::kScrollbarHorizontalTrack;
   } else {
     prev_button_ = new ScrollBarButton(this, ScrollBarButton::UP);
@@ skipping 166 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