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

Unified Diff: Source/platform/mac/ScrollAnimatorMac.mm

Issue 1234783005: Add API to send NSUserDefault values over IPC, while preserving current behavior (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 5 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 | « no previous file | Source/platform/scroll/ScrollbarThemeMacCommon.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/mac/ScrollAnimatorMac.mm
diff --git a/Source/platform/mac/ScrollAnimatorMac.mm b/Source/platform/mac/ScrollAnimatorMac.mm
index 1a97e6c6f55df83d482e1bef648e5804fd391603..f3a47378abd6629bd09534687d832f62e89afa3c 100644
--- a/Source/platform/mac/ScrollAnimatorMac.mm
+++ b/Source/platform/mac/ScrollAnimatorMac.mm
@@ -688,28 +688,14 @@ ScrollAnimatorMac::~ScrollAnimatorMac()
}
}
-static bool scrollAnimationEnabledForSystem()
-{
- static bool initialized = false;
- static bool enabled = true;
- if (!initialized) {
- // Check setting for OS X 10.8+.
- id value = [[NSUserDefaults standardUserDefaults] objectForKey:@"NSScrollAnimationEnabled"];
- // Check setting for OS X < 10.8.
- if (!value)
- value = [[NSUserDefaults standardUserDefaults] objectForKey:@"AppleScrollAnimationEnabled"];
- if (value)
- enabled = [value boolValue];
- initialized = true;
- }
- return enabled;
-}
-
ScrollResultOneDimensional ScrollAnimatorMac::userScroll(ScrollbarOrientation orientation, ScrollGranularity granularity, float step, float delta)
{
+ bool scrollAnimationEnabledForSystem = static_cast<ScrollbarThemeMacCommon*>(
+ ScrollbarTheme::theme())
+ ->scrollAnimationEnabledForSystem();
m_haveScrolledSincePageLoad = true;
- if (!scrollAnimationEnabledForSystem() || !m_scrollableArea->scrollAnimatorEnabled())
+ if (!scrollAnimationEnabledForSystem || !m_scrollableArea->scrollAnimatorEnabled())
return ScrollAnimator::userScroll(orientation, granularity, step, delta);
if (granularity == ScrollByPixel || granularity == ScrollByPrecisePixel)
« no previous file with comments | « no previous file | Source/platform/scroll/ScrollbarThemeMacCommon.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698