Merge pull request #6686 from darkdh/swipe_prefs

Swipe back/forward should respect system preferences
2016-08-03 16:10:29 +09:00 · 2016-08-03 16:10:29 +09:00 · 322fb97d8d
commit 322fb97d8d
parent b9bcba7abe e0c0e3e5f7
4 changed files with 17 additions and 0 deletions
--- a/atom/browser/api/atom_api_system_preferences.cc
+++ b/atom/browser/api/atom_api_system_preferences.cc
@ -59,6 +59,8 @@ void SystemPreferences::BuildPrototype(
      .SetMethod("unsubscribeLocalNotification",
                 &SystemPreferences::UnsubscribeLocalNotification)
      .SetMethod("getUserDefault", &SystemPreferences::GetUserDefault)
+      .SetMethod("isSwipeTrackingFromScrollEventsEnabled",
+                 &SystemPreferences::IsSwipeTrackingFromScrollEventsEnabled)
 #endif
      .SetMethod("isDarkMode", &SystemPreferences::IsDarkMode);
 }