Chromium Code Reviews| Index: chrome/browser/ui/cocoa/browser_window_controller_private.mm |
| diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm |
| index 85b230f11466d1e2feedb36589786f8401fe0bf8..577decf195e9043c96a7e83b2a9b81c09a2f3bb6 100644 |
| --- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm |
| +++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm |
| @@ -5,6 +5,7 @@ |
| #import "chrome/browser/ui/cocoa/browser_window_controller_private.h" |
| #include "base/command_line.h" |
| +#include "base/mac/mac_util.h" |
| #import "base/memory/scoped_nsobject.h" |
| #include "chrome/browser/browser_process.h" |
| #include "chrome/browser/prefs/pref_service.h" |
| @@ -543,4 +544,28 @@ willPositionSheet:(NSWindow*)sheet |
| // TOOD(rsesek): Properly implement Lion fullscreen <http://crbug.com/74065>. |
| } |
| +- (BOOL)recognizeTwoFingerGestures { |
| + // Lion or higher will have support for two-finger swipe gestures. |
| + if (!base::mac::IsOSLionOrLater()) |
| + return NO; |
| + |
| + // A note about preferences: |
| + // On Lion System Preferences, the swipe gesture behavior is controlled by the |
| + // setting in Trackpad --> More Gestures --> Swipe between pages. This setting |
| + // has three values: |
| + // A) Scroll left or right with two fingers. This should perform a cool |
| + // scrolling animation, but doesn't yet <http://crbug.com/90228>. |
| + // B) Swipe left or right with three fingers. |
| + // C) Swipe with two or three fingers. |
|
Nico
2011/07/22 20:21:14
In this case, the -swipe method isn't called becau
Robert Sesek
2011/07/22 20:26:23
Only for three fingers. That's always done by the
Nico
2011/07/22 20:30:08
I understood this. I was wondering if we would get
|
| + // |
| + // The three-finger gesture is controlled by the integer preference |
| + // |com.apple.trackpad.threeFingerHorizSwipeGesture|. Its value is 0 for (A) |
| + // and 1 for (B, C). |
| + // |
| + // The two-finger gesture is controlled by the preference below and is boolean |
| + // YES for (A, C) and NO for (B). |
| + NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults]; |
| + return [defaults boolForKey:@"AppleEnableSwipeNavigateWithScrolls"]; |
| +} |
| + |
| @end // @implementation BrowserWindowController(Private) |