Index: content/renderer/render_thread_impl.cc |
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc |
index 98cf865b75a289b5fca64e2702727de44238a902..94e435198b904391d2b8437fec4b01578da8c58e 100644 |
--- a/content/renderer/render_thread_impl.cc |
+++ b/content/renderer/render_thread_impl.cc |
@@ -761,16 +761,15 @@ void RenderThreadImpl::Init( |
switches::kEnableGpuMemoryBufferCompositorResources); |
#if defined(OS_MACOSX) |
- is_elastic_overscroll_enabled_ = base::mac::IsOSLionOrLater(); |
- if (is_elastic_overscroll_enabled_) { |
- base::ScopedCFTypeRef<CFStringRef> key( |
- base::SysUTF8ToCFStringRef("NSScrollViewRubberbanding")); |
- Boolean key_exists = false; |
- Boolean value = CFPreferencesGetAppBooleanValue( |
- key, kCFPreferencesCurrentApplication, &key_exists); |
- if (key_exists && !value) |
- is_elastic_overscroll_enabled_ = false; |
- } |
+ base::ScopedCFTypeRef<CFStringRef> key( |
+ base::SysUTF8ToCFStringRef("NSScrollViewRubberbanding")); |
+ Boolean key_exists = false; |
+ Boolean value = CFPreferencesGetAppBooleanValue( |
+ key, kCFPreferencesCurrentApplication, &key_exists); |
+ if (key_exists && !value) |
+ is_elastic_overscroll_enabled_ = false; |
+ else |
+ is_elastic_overscroll_enabled_ = true; |
tapted
2016/04/25 21:25:46
nit: maybe
is_elastic_oberscroll_enabled_ = !key
Nico
2016/04/26 14:30:44
Done.
|
#else |
is_elastic_overscroll_enabled_ = false; |
#endif |