summaryrefslogtreecommitdiffstats
path: root/base/mac
diff options
context:
space:
mode:
authorshrike <shrike@chromium.org>2015-10-26 11:53:08 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-26 18:54:08 +0000
commit20c59e0632ec7a6e1c688e184226a7dbe0ca4e59 (patch)
tree010d3bcb3106b9c510002e8c4fcf228a3e6bbef9 /base/mac
parent1abe59c0d39d5966c2d008177fdb4ad8282af4df (diff)
downloadchromium_src-20c59e0632ec7a6e1c688e184226a7dbe0ca4e59.zip
chromium_src-20c59e0632ec7a6e1c688e184226a7dbe0ca4e59.tar.gz
chromium_src-20c59e0632ec7a6e1c688e184226a7dbe0ca4e59.tar.bz2
Disable Force Touch lookup in the Omnibox.
Force Touch in the Omnibox can, under the right conditions, crash the browser. Force Touch isn't desirable anyway in the Omnibox, so this change disables it. BUG=544250 Review URL: https://codereview.chromium.org/1426463002 Cr-Commit-Position: refs/heads/master@{#356086}
Diffstat (limited to 'base/mac')
-rw-r--r--base/mac/sdk_forward_declarations.h21
1 files changed, 21 insertions, 0 deletions
diff --git a/base/mac/sdk_forward_declarations.h b/base/mac/sdk_forward_declarations.h
index bee324a..a6bf588 100644
--- a/base/mac/sdk_forward_declarations.h
+++ b/base/mac/sdk_forward_declarations.h
@@ -496,6 +496,27 @@ BASE_EXPORT extern NSString* const NSAppearanceNameVibrantDark;
- (void)viewDidLoad;
@end
+enum {
+ NSPressureBehaviorUnknown = -1,
+ NSPressureBehaviorPrimaryDefault = 0,
+ NSPressureBehaviorPrimaryClick = 1,
+ NSPressureBehaviorPrimaryGeneric = 2,
+ NSPressureBehaviorPrimaryAccelerator = 3,
+ NSPressureBehaviorPrimaryDeepClick = 5,
+ NSPressureBehaviorPrimaryDeepDrag = 6
+};
+typedef NSInteger NSPressureBehavior;
+
+@interface NSPressureConfiguration : NSObject
+- (instancetype)initWithPressureBehavior:(NSPressureBehavior)pressureBehavior;
+@end
+
+@class NSPressureConfiguration;
+
+@interface NSView (YosemiteSDK)
+- (void)setPressureConfiguration:(NSPressureConfiguration*)aConfiguration;
+@end
+
#endif // MAC_OS_X_VERSION_10_10
// ----------------------------------------------------------------------------