base/mac/sdk_forward_declarations.mm - Issue 1272503002: Fixed 2 bugs so that RequestDevice() works for non-paired devices

Side by Side Diff: base/mac/sdk_forward_declarations.mm

Issue 1272503002: Fixed 2 bugs so that RequestDevice() works for non-paired devices (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@test3

Patch Set: scheib fix Created 5 years, 4 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 unified diff | Download patch

« no previous file with comments | « base/mac/sdk_forward_declarations.h ('k') | device/bluetooth/bluetooth_low_energy_device_mac.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "base/mac/sdk_forward_declarations.h"	5 #include "base/mac/sdk_forward_declarations.h"

6	6

7 #if !defined(MAC_OS_X_VERSION_10_7) \|\| \	7 #if !defined(MAC_OS_X_VERSION_10_7) \|\| \

8 MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7	8 MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7

9 NSString* const NSWindowWillEnterFullScreenNotification =	9 NSString* const NSWindowWillEnterFullScreenNotification =

10 @"NSWindowWillEnterFullScreenNotification";	10 @"NSWindowWillEnterFullScreenNotification";

11	11

12 NSString* const NSWindowWillExitFullScreenNotification =	12 NSString* const NSWindowWillExitFullScreenNotification =

13 @"NSWindowWillExitFullScreenNotification";	13 @"NSWindowWillExitFullScreenNotification";

14	14

15 NSString* const NSWindowDidEnterFullScreenNotification =	15 NSString* const NSWindowDidEnterFullScreenNotification =

16 @"NSWindowDidEnterFullScreenNotification";	16 @"NSWindowDidEnterFullScreenNotification";

17	17

18 NSString* const NSWindowDidExitFullScreenNotification =	18 NSString* const NSWindowDidExitFullScreenNotification =

19 @"NSWindowDidExitFullScreenNotification";	19 @"NSWindowDidExitFullScreenNotification";

20	20

21 NSString* const NSWindowDidChangeBackingPropertiesNotification =	21 NSString* const NSWindowDidChangeBackingPropertiesNotification =

22 @"NSWindowDidChangeBackingPropertiesNotification";	22 @"NSWindowDidChangeBackingPropertiesNotification";

23	23

24 NSString* const CBAdvertisementDataServiceDataKey = @"kCBAdvDataServiceData";	24 NSString* const CBAdvertisementDataServiceDataKey = @"kCBAdvDataServiceData";

25	25

	26 NSString* const CBAdvertisementDataServiceUUIDsKey = @"kCBAdvDataServiceUUIDs";

	27

26 NSString* const NSPreferredScrollerStyleDidChangeNotification =	28 NSString* const NSPreferredScrollerStyleDidChangeNotification =

27 @"NSPreferredScrollerStyleDidChangeNotification";	29 @"NSPreferredScrollerStyleDidChangeNotification";

28 #endif // MAC_OS_X_VERSION_10_7	30 #endif // MAC_OS_X_VERSION_10_7

29	31

30 #if !defined(MAC_OS_X_VERSION_10_9) \|\| \	32 #if !defined(MAC_OS_X_VERSION_10_9) \|\| \

31 MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_9	33 MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_9

32 NSString* const NSWindowDidChangeOcclusionStateNotification =	34 NSString* const NSWindowDidChangeOcclusionStateNotification =

33 @"NSWindowDidChangeOcclusionStateNotification";	35 @"NSWindowDidChangeOcclusionStateNotification";

34	36

	37 NSString* const CBAdvertisementDataOverflowServiceUUIDsKey =

	38 @"kCBAdvDataOverflowServiceUUIDs";

	39

35 NSString* const CBAdvertisementDataIsConnectable = @"kCBAdvDataIsConnectable";	40 NSString* const CBAdvertisementDataIsConnectable = @"kCBAdvDataIsConnectable";

36 #endif // MAC_OS_X_VERSION_10_9	41 #endif // MAC_OS_X_VERSION_10_9

37	42

38 #if !defined(MAC_OS_X_VERSION_10_10) \|\| \	43 #if !defined(MAC_OS_X_VERSION_10_10) \|\| \

39 MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_10	44 MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_10

40 NSString* const NSUserActivityTypeBrowsingWeb =	45 NSString* const NSUserActivityTypeBrowsingWeb =

41 @"NSUserActivityTypeBrowsingWeb";	46 @"NSUserActivityTypeBrowsingWeb";

42	47

43 NSString* const NSAppearanceNameVibrantDark = @"NSAppearanceNameVibrantDark";	48 NSString* const NSAppearanceNameVibrantDark = @"NSAppearanceNameVibrantDark";

44 #endif // MAC_OS_X_VERSION_10_10	49 #endif // MAC_OS_X_VERSION_10_10

OLD	NEW