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

Unified Diff: Source/platform/scroll/ScrollbarThemeAndroid.cpp

Issue 1318603005: Revert of Replace pinch scrollbars with regular scrollbars. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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 | « Source/platform/scroll/ScrollableArea.h ('k') | Source/platform/scroll/ScrollbarThemeOverlay.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/scroll/ScrollbarThemeAndroid.cpp
diff --git a/Source/platform/scroll/ScrollbarThemeAndroid.cpp b/Source/platform/scroll/ScrollbarThemeAndroid.cpp
index 1b1dacdca5ae8f637343c998b1cc71d02843e47e..e2f180b36cc3fdc2e775331b16630121e6a6df53 100644
--- a/Source/platform/scroll/ScrollbarThemeAndroid.cpp
+++ b/Source/platform/scroll/ScrollbarThemeAndroid.cpp
@@ -32,7 +32,8 @@
ScrollbarTheme* ScrollbarTheme::nativeTheme()
{
- return ScrollbarThemeOverlay::mobileTheme();
+ DEFINE_STATIC_LOCAL(ScrollbarThemeOverlay, theme, (3, 3, ScrollbarThemeOverlay::DisallowHitTest, Color(128, 128, 128, 128)));
+ return &theme;
}
} // namespace blink
« no previous file with comments | « Source/platform/scroll/ScrollableArea.h ('k') | Source/platform/scroll/ScrollbarThemeOverlay.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698