Chromium Code Reviews| Index: ui/views/controls/scrollbar/native_scroll_bar_views.cc |
| diff --git a/ui/views/controls/scrollbar/native_scroll_bar_views.cc b/ui/views/controls/scrollbar/native_scroll_bar_views.cc |
| index 3348b5bcbca041cc3e422722b685040a623e0c45..006e4fbce641233b33e3310cee90a0cb11d16529 100644 |
| --- a/ui/views/controls/scrollbar/native_scroll_bar_views.cc |
| +++ b/ui/views/controls/scrollbar/native_scroll_bar_views.cc |
| @@ -29,7 +29,7 @@ class ScrollBarButton : public BaseScrollBarButton { |
| 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
spqchan
2016/02/13 01:39:23
I removed all the diffs involving NativeScrollBar
|
| ~ScrollBarButton() override; |
| gfx::Size GetPreferredSize() const override; |
| @@ -49,7 +49,7 @@ class ScrollBarButton : public BaseScrollBarButton { |
| // 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; |
| @@ -70,8 +70,7 @@ class ScrollBarThumb : public BaseScrollBarThumb { |
| // ScrollBarButton |
| ScrollBarButton::ScrollBarButton(ButtonListener* listener, Type type) |
| - : BaseScrollBarButton(listener), |
| - type_(type) { |
| + : BaseScrollBarButton(listener), type_(type) { |
| SetFocusable(false); |
| SetAccessibilityFocusable(false); |
| } |
| @@ -219,8 +218,7 @@ ui::NativeTheme::State ScrollBarThumb::GetNativeThemeState() const { |
| 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()); |