diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-11-23 15:05:51 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-11-23 15:31:48 +0000 |
| commit | 9cb87fa7638e305ef35b04f54ba07ac4fa04adcb (patch) | |
| tree | 2793d80883b7daab67258117755046d428f9978c /chromium/base | |
| parent | 98ff39cb35ef2bd32bb1af9565628a4a4b0979b2 (diff) | |
| download | qtwebengine-chromium-9cb87fa7638e305ef35b04f54ba07ac4fa04adcb.tar.gz | |
BASELINE: Update Chromium to 47.0.2526.71
Also adds a few missing spellcheck sources.
Change-Id: I300864710316ff3cd3ad456dd7a3d048b45f57d5
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'chromium/base')
| -rw-r--r-- | chromium/base/mac/sdk_forward_declarations.h | 21 | ||||
| -rw-r--r-- | chromium/base/win/event_trace_controller_unittest.cc | 3 |
2 files changed, 23 insertions, 1 deletions
diff --git a/chromium/base/mac/sdk_forward_declarations.h b/chromium/base/mac/sdk_forward_declarations.h index 79d2e09a199..057e951ce27 100644 --- a/chromium/base/mac/sdk_forward_declarations.h +++ b/chromium/base/mac/sdk_forward_declarations.h @@ -495,6 +495,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 // ---------------------------------------------------------------------------- diff --git a/chromium/base/win/event_trace_controller_unittest.cc b/chromium/base/win/event_trace_controller_unittest.cc index 317327573bb..c947ed707f5 100644 --- a/chromium/base/win/event_trace_controller_unittest.cc +++ b/chromium/base/win/event_trace_controller_unittest.cc @@ -180,7 +180,8 @@ TEST_F(EtwTraceControllerTest, StartFileSession) { base::DeleteFile(temp, false); } -TEST_F(EtwTraceControllerTest, EnableDisable) { +// This test is flaky for unclear reasons. See bugs 525297 and 534184 +TEST_F(EtwTraceControllerTest, DISABLED_EnableDisable) { TestingProvider provider(test_provider_); EXPECT_EQ(ERROR_SUCCESS, provider.Register()); |