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

Unified Diff: content/renderer/webscrollbarbehavior_impl_gtkoraura.cc

Issue 234533002: Remove a bunch of TOOLKIT_GTK in content/ and gpu/, as well as NPAPI plugins on linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, skip changing browser_main_loop.cc because of presubmit issues, will follow up Created 6 years, 8 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 | « content/renderer/renderer_webkitplatformsupport_impl.cc ('k') | content/shell/browser/shell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/webscrollbarbehavior_impl_gtkoraura.cc
diff --git a/content/renderer/webscrollbarbehavior_impl_gtkoraura.cc b/content/renderer/webscrollbarbehavior_impl_gtkoraura.cc
index 8398858b5b2e95efe1a5d243c6a426cc1e51f10c..e9d77bb3f50c81192d3d75e843ca5525c3c4fbb5 100644
--- a/content/renderer/webscrollbarbehavior_impl_gtkoraura.cc
+++ b/content/renderer/webscrollbarbehavior_impl_gtkoraura.cc
@@ -13,7 +13,7 @@ bool WebScrollbarBehaviorImpl::shouldCenterOnThumb(
blink::WebScrollbarBehavior::Button mouseButton,
bool shiftKeyPressed,
bool altKeyPressed) {
-#if defined(TOOLKIT_GTK) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS))
if (mouseButton == blink::WebScrollbarBehavior::ButtonMiddle)
return true;
#endif
@@ -25,10 +25,6 @@ bool WebScrollbarBehaviorImpl::shouldSnapBackToDragOrigin(
const blink::WebPoint& eventPoint,
const blink::WebRect& scrollbarRect,
bool isHorizontal) {
-#if defined(TOOLKIT_GTK)
- return false;
-#endif
-
// Constants used to figure the drag rect outside which we should snap the
// scrollbar thumb back to its origin. These calculations are based on
// observing the behavior of the MSVC8 main window scrollbar + some
@@ -48,4 +44,4 @@ bool WebScrollbarBehaviorImpl::shouldSnapBackToDragOrigin(
return !noSnapRect.Contains(eventPoint);
}
-} // namespace content
+} // namespace content
« no previous file with comments | « content/renderer/renderer_webkitplatformsupport_impl.cc ('k') | content/shell/browser/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698