Index: third_party/WebKit/Source/platform/scroll/ScrollbarThemeMac.mm |
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMac.mm b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMac.mm |
index 694e822d7f0a8ee2144bb2e2e778f1a0b2348203..60d97556f4c6f11a0934be919c53a2d87cbd020b 100644 |
--- a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMac.mm |
+++ b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMac.mm |
@@ -287,7 +287,7 @@ void ScrollbarThemeMac::registerScrollbar(ScrollbarThemeClient& scrollbar) { |
scrollbarPainterMap().add(&scrollbar, observer); |
updateEnabledState(scrollbar); |
- updateScrollbarOverlayStyle(scrollbar); |
+ updateScrollbarOverlayColorTheme(scrollbar); |
} |
void ScrollbarThemeMac::unregisterScrollbar(ScrollbarThemeClient& scrollbar) { |
@@ -305,7 +305,7 @@ void ScrollbarThemeMac::setNewPainterForScrollbar( |
painter:scrollbarPainter]); |
scrollbarPainterMap().set(&scrollbar, observer); |
updateEnabledState(scrollbar); |
- updateScrollbarOverlayStyle(scrollbar); |
+ updateScrollbarOverlayColorTheme(scrollbar); |
} |
ScrollbarPainter ScrollbarThemeMac::painterForScrollbar( |
@@ -400,17 +400,14 @@ bool ScrollbarThemeMac::usesOverlayScrollbars() const { |
return recommendedScrollerStyle() == NSScrollerStyleOverlay; |
} |
-void ScrollbarThemeMac::updateScrollbarOverlayStyle( |
+void ScrollbarThemeMac::updateScrollbarOverlayColorTheme( |
const ScrollbarThemeClient& scrollbar) { |
ScrollbarPainter painter = painterForScrollbar(scrollbar); |
- switch (scrollbar.getScrollbarOverlayStyle()) { |
- case ScrollbarOverlayStyleDefault: |
- [painter setKnobStyle:NSScrollerKnobStyleDefault]; |
- break; |
- case ScrollbarOverlayStyleDark: |
+ switch (scrollbar.getScrollbarOverlayColorTheme()) { |
+ case ScrollbarOverlayColorThemeDark: |
[painter setKnobStyle:NSScrollerKnobStyleDark]; |
break; |
- case ScrollbarOverlayStyleLight: |
+ case ScrollbarOverlayColorThemeLight: |
[painter setKnobStyle:NSScrollerKnobStyleLight]; |
break; |
} |