summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm')
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
index 8ac4371..727df0b 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
@@ -94,7 +94,12 @@ using bookmarks::BookmarkNode;
@private
NSSize cellSize_;
}
+#if !defined(MAC_OS_X_VERSION_10_10) || \
+ MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_10
+// In the OSX 10.10 SDK, cellSize became an atomic property, so there is no
+// need to redeclare it.
@property (nonatomic, readonly) NSSize cellSize;
+#endif // MAC_OS_X_VERSION_10_10
@end
@implementation CellWithDesiredSize