diff options
| -rw-r--r-- | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm | 2 | ||||
| -rw-r--r-- | third_party/ocmock/ocmock_extensions.h | 1 | ||||
| -rw-r--r-- | third_party/ocmock/ocmock_extensions.mm | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm index 2321dd7..25da95d 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm @@ -112,7 +112,7 @@ class BookmarkBarFolderViewTest : public CocoaProfileTest { draggingAllowed:OCMOCK_ANY]; [[[mock_controller stub] andReturnBool:show_indicator] shouldShowIndicatorShownForPoint:kPoint]; - [[[mock_controller stub] andReturnFloat:kFakeIndicatorPos] + [[[mock_controller stub] andReturnCGFloat:kFakeIndicatorPos] indicatorPosForDragToPoint:kPoint]; [[[mock_controller stub] andReturnValue:OCMOCK_VALUE(model)] bookmarkModel]; return [mock_controller retain]; diff --git a/third_party/ocmock/ocmock_extensions.h b/third_party/ocmock/ocmock_extensions.h index 2ca182c..d817cbd 100644 --- a/third_party/ocmock/ocmock_extensions.h +++ b/third_party/ocmock/ocmock_extensions.h @@ -30,6 +30,7 @@ - (id)andReturnInteger:(NSInteger)value; - (id)andReturnUnsignedInteger:(NSUInteger)value; #if !TARGET_OS_IPHONE +- (id)andReturnCGFloat:(CGFloat)value; - (id)andReturnNSRect:(NSRect)rect; - (id)andReturnCGRect:(CGRect)rect; - (id)andReturnNSPoint:(NSPoint)point; diff --git a/third_party/ocmock/ocmock_extensions.mm b/third_party/ocmock/ocmock_extensions.mm index 353012e..bcf11b3 100644 --- a/third_party/ocmock/ocmock_extensions.mm +++ b/third_party/ocmock/ocmock_extensions.mm @@ -30,6 +30,8 @@ CR_OCMOCK_RETURN_IMPL(Integer, NSInteger); CR_OCMOCK_RETURN_IMPL(UnsignedInteger, NSUInteger); #if !TARGET_OS_IPHONE +CR_OCMOCK_RETURN_IMPL(CGFloat, CGFloat); + - (id)andReturnNSRect:(NSRect)rect { return [self andReturnValue:[NSValue valueWithRect:rect]]; } |