Index: content/child/webthemeengine_impl_android.cc |
diff --git a/content/child/webthemeengine_impl_android.cc b/content/child/webthemeengine_impl_android.cc |
index d659241610153438bf17cbc3dbe73d0a3699d3de..fa693b3cf9cb828de50d999ba530dc43c3a85629 100644 |
--- a/content/child/webthemeengine_impl_android.cc |
+++ b/content/child/webthemeengine_impl_android.cc |
@@ -39,15 +39,13 @@ |
case WebThemeEngine::PartScrollbarUpArrow: |
return ui::NativeTheme::kScrollbarUpArrow; |
case WebThemeEngine::PartScrollbarHorizontalThumb: |
- return ui::NativeTheme::kScrollbarHorizontalThumb; |
case WebThemeEngine::PartScrollbarVerticalThumb: |
- return ui::NativeTheme::kScrollbarVerticalThumb; |
case WebThemeEngine::PartScrollbarHorizontalTrack: |
- return ui::NativeTheme::kScrollbarHorizontalTrack; |
case WebThemeEngine::PartScrollbarVerticalTrack: |
- return ui::NativeTheme::kScrollbarVerticalTrack; |
case WebThemeEngine::PartScrollbarCorner: |
- return ui::NativeTheme::kScrollbarCorner; |
+ // Android doesn't draw scrollbars. |
+ NOTREACHED(); |
+ return static_cast<ui::NativeTheme::Part>(0); |
case WebThemeEngine::PartCheckbox: |
return ui::NativeTheme::kCheckbox; |
case WebThemeEngine::PartRadio: |
@@ -169,21 +167,9 @@ |
} |
blink::WebSize WebThemeEngineImpl::getSize(WebThemeEngine::Part part) { |
- switch (part) { |
- case ui::NativeTheme::kScrollbarHorizontalThumb: |
- case ui::NativeTheme::kScrollbarVerticalThumb: { |
- // Minimum length for scrollbar thumb is the scrollbar thickness. |
- ScrollbarStyle style; |
- getOverlayScrollbarStyle(&style); |
- int scrollbarThickness = style.thumbThickness + style.scrollbarMargin; |
- return gfx::Size(scrollbarThickness, scrollbarThickness); |
- } |
- default: { |
- ui::NativeTheme::ExtraParams extra; |
- return ui::NativeTheme::GetInstanceForWeb()->GetPartSize( |
- NativeThemePart(part), ui::NativeTheme::kNormal, extra); |
- } |
- } |
+ ui::NativeTheme::ExtraParams extra; |
+ return ui::NativeTheme::GetInstanceForWeb()->GetPartSize( |
+ NativeThemePart(part), ui::NativeTheme::kNormal, extra); |
} |
void WebThemeEngineImpl::getOverlayScrollbarStyle(ScrollbarStyle* style) { |