| Index: ui/views/controls/scrollbar/cocoa_scroll_bar.mm
|
| diff --git a/ui/views/controls/scrollbar/cocoa_scroll_bar.mm b/ui/views/controls/scrollbar/cocoa_scroll_bar.mm
|
| index 40390cd1b95227b67b4369d2cb1166805f861ab6..9d54b673b7772dac0d8b2fdf12c75d8f286a4249 100644
|
| --- a/ui/views/controls/scrollbar/cocoa_scroll_bar.mm
|
| +++ b/ui/views/controls/scrollbar/cocoa_scroll_bar.mm
|
| @@ -208,12 +208,12 @@ gfx::Rect CocoaScrollBar::GetTrackBounds() const {
|
| //////////////////////////////////////////////////////////////////
|
| // CocoaScrollBar, ScrollBar:
|
|
|
| -int CocoaScrollBar::GetLayoutSize() const {
|
| - return scroller_style_ == NSScrollerStyleOverlay ? 0 : ScrollbarThickness();
|
| +int CocoaScrollBar::GetThickness() const {
|
| + return ScrollbarThickness();
|
| }
|
|
|
| -int CocoaScrollBar::GetContentOverlapSize() const {
|
| - return scroller_style_ == NSScrollerStyleLegacy ? 0 : ScrollbarThickness();
|
| +bool CocoaScrollBar::OverlapsContent() const {
|
| + return scroller_style_ == NSScrollerStyleOverlay;
|
| }
|
|
|
| //////////////////////////////////////////////////////////////////
|
|
|