Index: ui/native_theme/native_theme_base.cc |
diff --git a/ui/native_theme/native_theme_base.cc b/ui/native_theme/native_theme_base.cc |
index 331ceb46be0a5bfe58551fccd79bd72ee21cbf3f..b9d2827db8961cd0c240bcf7c01f23fde6359027 100644 |
--- a/ui/native_theme/native_theme_base.cc |
+++ b/ui/native_theme/native_theme_base.cc |
@@ -156,31 +156,6 @@ gfx::Size NativeThemeBase::GetPartSize(Part part, |
return gfx::Size(); |
} |
-void NativeThemeBase::PaintStateTransition(SkCanvas* canvas, |
- Part part, |
- State startState, |
- State endState, |
- double progress, |
- const gfx::Rect& rect) const { |
- if (rect.IsEmpty()) |
- return; |
- |
- // Currently state transition is animation only working for overlay scrollbars |
- // on Aura platforms. |
- switch (part) { |
- case kScrollbarHorizontalThumb: |
- case kScrollbarVerticalThumb: |
- PaintScrollbarThumbStateTransition(canvas, part, startState, endState, |
- progress, rect); |
- break; |
- default: |
- NOTREACHED() << "Does not support state transition for this part:" |
- << part; |
- break; |
- } |
- return; |
-} |
- |
void NativeThemeBase::Paint(SkCanvas* canvas, |
Part part, |
State state, |
@@ -227,7 +202,8 @@ void NativeThemeBase::Paint(SkCanvas* canvas, |
break; |
case kScrollbarHorizontalThumb: |
case kScrollbarVerticalThumb: |
- PaintScrollbarThumb(canvas, part, state, rect); |
+ PaintScrollbarThumb(canvas, part, state, rect, |
+ extra.scrollbar_thumb.scrollbar_theme); |
break; |
case kScrollbarHorizontalTrack: |
case kScrollbarVerticalTrack: |
@@ -434,9 +410,10 @@ void NativeThemeBase::PaintScrollbarTrack(SkCanvas* canvas, |
} |
void NativeThemeBase::PaintScrollbarThumb(SkCanvas* canvas, |
- Part part, |
- State state, |
- const gfx::Rect& rect) const { |
+ Part part, |
+ State state, |
+ const gfx::Rect& rect, |
+ ScrollbarOverlayColorTheme) const { |
const bool hovered = state == kHovered; |
const int midx = rect.x() + rect.width() / 2; |
const int midy = rect.y() + rect.height() / 2; |