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

Unified Diff: content/renderer/render_thread_impl.cc

Issue 1917973002: mac: Remove IsOSLion(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tapted Created 4 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/common/sandbox_mac.mm ('k') | device/bluetooth/bluetooth_adapter_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..788c52cda071e160e5d8cbaa4a361de45c446bb7 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -761,16 +761,12 @@ 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);
+ is_elastic_overscroll_enabled_ = !key_exists || value;
#else
is_elastic_overscroll_enabled_ = false;
#endif
« no previous file with comments | « content/common/sandbox_mac.mm ('k') | device/bluetooth/bluetooth_adapter_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698