2 files changed, 1 insertions, 13 deletions
diff --git a/webkit/plugins/ppapi/ppb_scrollbar_impl.cc b/webkit/plugins/ppapi/ppb_scrollbar_impl.cc
index cf197ec..3407ba7 100644
--- a/webkit/plugins/ppapi/ppb_scrollbar_impl.cc
+++ b/webkit/plugins/ppapi/ppb_scrollbar_impl.cc
@@ -125,16 +125,10 @@ PPB_Scrollbar_Impl::~PPB_Scrollbar_Impl() {
 }
 
 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 @@ uint32_t PPB_Scrollbar_Impl::GetThickness() {
 }
 
 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() {
diff --git a/webkit/plugins/ppapi/ppb_scrollbar_impl.h b/webkit/plugins/ppapi/ppb_scrollbar_impl.h
index 5fca18b..7ffbbcf 100644
--- a/webkit/plugins/ppapi/ppb_scrollbar_impl.h
+++ b/webkit/plugins/ppapi/ppb_scrollbar_impl.h
@@ -63,8 +63,7 @@ class PPB_Scrollbar_Impl : public PPB_Widget_Impl,
 
   // WebKit::WebScrollbarClient implementation.
   virtual void valueChanged(WebKit::WebScrollbar* scrollbar) OVERRIDE;
-  // TODO(jam): add OVERRIDE once WebKit is rolled
-  virtual void overlayChanged(WebKit::WebScrollbar* scrollbar);
+  virtual void overlayChanged(WebKit::WebScrollbar* scrollbar) OVERRIDE;
   virtual void invalidateScrollbarRect(WebKit::WebScrollbar* scrollbar,
                                        const WebKit::WebRect& rect) OVERRIDE;
   virtual void getTickmarks(