| Index: ui/views/controls/scrollbar/scroll_bar_views.cc
|
| diff --git a/ui/views/controls/scrollbar/scroll_bar_views.cc b/ui/views/controls/scrollbar/scroll_bar_views.cc
|
| index 066a56c5ca61d20e3cd571f149657333d6e9dae0..882e3814bd220df6f5090d050f4404809fb82896 100644
|
| --- a/ui/views/controls/scrollbar/scroll_bar_views.cc
|
| +++ b/ui/views/controls/scrollbar/scroll_bar_views.cc
|
| @@ -278,15 +278,15 @@ void ScrollBarViews::OnPaint(gfx::Canvas* canvas) {
|
| }
|
|
|
| gfx::Size ScrollBarViews::GetPreferredSize() const {
|
| - return gfx::Size(IsHorizontal() ? 0 : GetLayoutSize(),
|
| - IsHorizontal() ? GetLayoutSize() : 0);
|
| + return gfx::Size(IsHorizontal() ? 0 : GetThickness(),
|
| + IsHorizontal() ? GetThickness() : 0);
|
| }
|
|
|
| const char* ScrollBarViews::GetClassName() const {
|
| return kViewClassName;
|
| }
|
|
|
| -int ScrollBarViews::GetLayoutSize() const {
|
| +int ScrollBarViews::GetThickness() const {
|
| const ui::NativeTheme* theme = GetNativeTheme();
|
| return IsHorizontal() ? GetHorizontalScrollBarHeight(theme)
|
| : GetVerticalScrollBarWidth(theme);
|
|
|