Index: webkit/plugins/ppapi/ppb_scrollbar_impl.cc |
=================================================================== |
--- webkit/plugins/ppapi/ppb_scrollbar_impl.cc (revision 96577) |
+++ webkit/plugins/ppapi/ppb_scrollbar_impl.cc (working copy) |
@@ -125,16 +125,10 @@ |
} |
void PPB_Scrollbar_Impl::Init(bool vertical) { |
-#if defined(WEBSCROLLBAR_SUPPORTS_OVERLAY) |
scrollbar_.reset(WebScrollbar::createForPlugin( |
vertical ? WebScrollbar::Vertical : WebScrollbar::Horizontal, |
instance()->container(), |
static_cast<WebKit::WebScrollbarClient*>(this))); |
-#else |
- scrollbar_.reset(WebScrollbar::create( |
- static_cast<WebKit::WebScrollbarClient*>(this), |
- vertical ? WebScrollbar::Vertical : WebScrollbar::Horizontal)); |
-#endif |
} |
PPB_Scrollbar_API* PPB_Scrollbar_Impl::AsPPB_Scrollbar_API() { |
@@ -156,12 +150,7 @@ |
} |
bool PPB_Scrollbar_Impl::IsOverlay() { |
-// TODO(jam): take this out once WebKit is rolled. |
-#if defined(WEBSCROLLBAR_SUPPORTS_OVERLAY) |
return scrollbar_->isOverlay(); |
-#else |
- return false; |
-#endif |
} |
uint32_t PPB_Scrollbar_Impl::GetValue() { |