Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(594)

Unified Diff: webkit/plugins/ppapi/ppb_scrollbar_impl.cc

Issue 7637018: Get rid of temporary scrollbar code now that WebKit is rolled. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/plugins/ppapi/ppb_scrollbar_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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() {
« no previous file with comments | « webkit/plugins/ppapi/ppb_scrollbar_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698