diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | base/DEPS | 1 | ||||
| -rw-r--r-- | base/cocoa_protocols_mac.h | 6 |
3 files changed, 6 insertions, 3 deletions
@@ -212,7 +212,7 @@ deps_os = { "/trunk/deps/reference_builds/chrome_mac@41963", "src/third_party/GTM": - "http://google-toolbox-for-mac.googlecode.com/svn/trunk@330", + "http://google-toolbox-for-mac.googlecode.com/svn/trunk@375", "src/third_party/pdfsqueeze": "http://pdfsqueeze.googlecode.com/svn/trunk@2", "src/third_party/lighttpd": @@ -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) |