base/mac/cocoa_protocols.h - Issue 862133002: Update from https://crrev.com/312398

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: base/mac/cocoa_protocols.h

Issue 862133002: Update from https://crrev.com/312398 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 5 years, 11 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/ios/weak_nsobject_unittest.mm ('k') | base/mac/scoped_nsobject.h » ('j') | shell/BUILD.gn » ('J')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 #ifndef BASE_COCOA_PROTOCOLS_MAC_H_	5 #ifndef BASE_COCOA_PROTOCOLS_MAC_H_

6 #define BASE_COCOA_PROTOCOLS_MAC_H_	6 #define BASE_COCOA_PROTOCOLS_MAC_H_

7	7

8 #import <Cocoa/Cocoa.h>	8 #import <Cocoa/Cocoa.h>

9	9

10 // GTM also maintains a list of empty protocols, but only the ones the library

11 // requires. Augment that below.

12 #import "third_party/google_toolbox_for_mac/src/GTMDefines.h"

13

14 // New Mac OS X SDKs introduce new protocols used for delegates. These	10 // New Mac OS X SDKs introduce new protocols used for delegates. These

15 // protocol defintions aren't not present in earlier releases of the Mac OS X	11 // protocol defintions aren't not present in earlier releases of the Mac OS X

16 // SDK. In order to support building against the new SDK, which requires	12 // SDK. In order to support building against the new SDK, which requires

17 // delegates to conform to these protocols, and earlier SDKs, which do not	13 // delegates to conform to these protocols, and earlier SDKs, which do not

18 // define these protocols at all, this file will provide empty protocol	14 // define these protocols at all, this file will provide empty protocol

19 // definitions when used with earlier SDK versions.	15 // definitions when used with earlier SDK versions.

20	16

21 #define DEFINE_EMPTY_PROTOCOL(p) \	17 #define DEFINE_EMPTY_PROTOCOL(p) \

22 @protocol p \	18 @protocol p \

23 @end	19 @end

24	20

25 #if !defined(MAC_OS_X_VERSION_10_7) \|\| \	21 #if !defined(MAC_OS_X_VERSION_10_7) \|\| \

26 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7	22 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7

27	23

28 DEFINE_EMPTY_PROTOCOL(NSDraggingDestination)	24 DEFINE_EMPTY_PROTOCOL(NSDraggingDestination)

29 DEFINE_EMPTY_PROTOCOL(ICCameraDeviceDownloadDelegate)	25 DEFINE_EMPTY_PROTOCOL(ICCameraDeviceDownloadDelegate)

30	26

31 #endif // MAC_OS_X_VERSION_10_7	27 #endif // MAC_OS_X_VERSION_10_7

32	28

33 #undef DEFINE_EMPTY_PROTOCOL	29 #undef DEFINE_EMPTY_PROTOCOL

34	30

35 #endif // BASE_COCOA_PROTOCOLS_MAC_H_	31 #endif // BASE_COCOA_PROTOCOLS_MAC_H_

OLD	NEW