Index: ui/native_theme/native_theme_base.h |
diff --git a/ui/native_theme/native_theme_base.h b/ui/native_theme/native_theme_base.h |
index 3a8ddde23d1244ffdd37e2d09b88a4467b2660d5..66752140b7bb8177e56abf8618ede35845995800 100644 |
--- a/ui/native_theme/native_theme_base.h |
+++ b/ui/native_theme/native_theme_base.h |
@@ -40,7 +40,8 @@ class NATIVE_THEME_EXPORT NativeThemeBase : public NativeTheme { |
State startState, |
State endState, |
double progress, |
- const gfx::Rect& rect) const override; |
+ const gfx::Rect& rect, |
+ ScrollbarOverlayStyle style) const override; |
protected: |
NativeThemeBase(); |
@@ -65,7 +66,8 @@ class NATIVE_THEME_EXPORT NativeThemeBase : public NativeTheme { |
SkCanvas* canvas, |
Part part, |
State state, |
- const gfx::Rect& rect) const; |
+ const gfx::Rect& rect, |
+ NativeTheme::ScrollbarOverlayStyle style) const; |
virtual void PaintScrollbarCorner(SkCanvas* canvas, |
State state, |
@@ -136,13 +138,14 @@ class NATIVE_THEME_EXPORT NativeThemeBase : public NativeTheme { |
const gfx::Rect& rect, |
const ProgressBarExtraParams& progress_bar) const; |
- virtual void PaintScrollbarThumbStateTransition(SkCanvas* canvas, |
- Part part, |
- State startState, |
- State endState, |
- double progress, |
- const gfx::Rect& rect) const { |
- } |
+ virtual void PaintScrollbarThumbStateTransition( |
+ SkCanvas* canvas, |
+ Part part, |
+ State startState, |
+ State endState, |
+ double progress, |
+ const gfx::Rect& rect, |
+ ScrollbarOverlayStyle style) const {} |
// Shrinks checkbox/radio button rect, if necessary, to make room for padding |
// and drop shadow. |
@@ -169,6 +172,8 @@ class NATIVE_THEME_EXPORT NativeThemeBase : public NativeTheme { |
// Returns the color used to draw the arrow. |
SkColor GetArrowColor(State state) const; |
+ unsigned int scrollbar_width_; |
+ |
private: |
friend class NativeThemeAuraTest; |
@@ -201,8 +206,6 @@ class NATIVE_THEME_EXPORT NativeThemeBase : public NativeTheme { |
const gfx::Rect& rect, |
const SkScalar borderRadius) const; |
- unsigned int scrollbar_width_; |
- |
// The length of the arrow buttons, 0 means no buttons are drawn. |
unsigned int scrollbar_button_length_; |