diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-12 20:13:29 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-12 20:13:29 +0000 |
| commit | 1ca30a75740080060549aa93f28b7b94e443b94c (patch) | |
| tree | eb9ccd104db3c015a7564558f3c66440e2ddd993 /base | |
| parent | 0ceaf4e221365b7b9f054c38c320d4a77a510b74 (diff) | |
| download | chromium_src-1ca30a75740080060549aa93f28b7b94e443b94c.zip chromium_src-1ca30a75740080060549aa93f28b7b94e443b94c.tar.gz chromium_src-1ca30a75740080060549aa93f28b7b94e443b94c.tar.bz2 | |
Roll GTM r330:375.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2969003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52127 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/DEPS | 1 | ||||
| -rw-r--r-- | base/cocoa_protocols_mac.h | 6 |
2 files changed, 5 insertions, 2 deletions
@@ -1,6 +1,7 @@ include_rules = [ "+third_party/libevent", "+third_party/dmg_fp", + "+third_party/GTM", "+third_party/modp_b64", "+third_party/tcmalloc", diff --git a/base/cocoa_protocols_mac.h b/base/cocoa_protocols_mac.h index a98d472..ce3845d 100644 --- a/base/cocoa_protocols_mac.h +++ b/base/cocoa_protocols_mac.h @@ -7,6 +7,10 @@ #import <Cocoa/Cocoa.h> +// GTM also maintinas a list of empty protocols, but only the ones the library +// requires. Augment that below. +#import "third_party/GTM/GTMDefines.h" + // The Mac OS X 10.6 SDK introduced new protocols used for delegates. These // protocol defintions were not present in earlier releases of the Mac OS X // SDK. In order to support building against the new SDK, which requires @@ -22,7 +26,6 @@ @end DEFINE_EMPTY_PROTOCOL(NSAlertDelegate) -DEFINE_EMPTY_PROTOCOL(NSAnimationDelegate) DEFINE_EMPTY_PROTOCOL(NSControlTextEditingDelegate) DEFINE_EMPTY_PROTOCOL(NSMatrixDelegate) DEFINE_EMPTY_PROTOCOL(NSMenuDelegate) @@ -30,7 +33,6 @@ DEFINE_EMPTY_PROTOCOL(NSOpenSavePanelDelegate) DEFINE_EMPTY_PROTOCOL(NSOutlineViewDelegate) DEFINE_EMPTY_PROTOCOL(NSTableViewDataSource) DEFINE_EMPTY_PROTOCOL(NSTableViewDelegate) -DEFINE_EMPTY_PROTOCOL(NSTabViewDelegate) DEFINE_EMPTY_PROTOCOL(NSTextFieldDelegate) DEFINE_EMPTY_PROTOCOL(NSTextViewDelegate) DEFINE_EMPTY_PROTOCOL(NSWindowDelegate) |