chrome/browser/cocoa/bookmark_bar_controller_unittest.mm - Issue 2769014: Mac/clang: Possibly contentious changes.

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

Unified Diff: chrome/browser/cocoa/bookmark_bar_controller_unittest.mm

Issue 2769014: Mac/clang: Possibly contentious changes. (Closed)

Patch Set: comments2 Created 10 years, 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/cocoa/background_tile_view.h ('k') | chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm » ('j') | chrome/browser/geolocation/wifi_data_provider_corewlan_mac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/cocoa/bookmark_bar_controller_unittest.mm

diff --git a/chrome/browser/cocoa/bookmark_bar_controller_unittest.mm b/chrome/browser/cocoa/bookmark_bar_controller_unittest.mm

index 5c2e8ccb975f6705927f6640c772f7f90b5d0f65..f26484b93198cf0b18f29926467fed5b08cda88c 100644

--- a/chrome/browser/cocoa/bookmark_bar_controller_unittest.mm

+++ b/chrome/browser/cocoa/bookmark_bar_controller_unittest.mm

@@ -52,7 +52,7 @@

@private

NSSize cellSize_;

}

-@property(readonly) NSSize cellSize;

+@property (nonatomic, readonly) NSSize cellSize;

@end

@implementation CellWithDesiredSize

@@ -73,7 +73,7 @@

@private

int toggles_;

}

-@property (readonly) int toggles;

+@property (nonatomic, readonly) int toggles;

@end

@implementation BookmarkBarControllerTogglePong

@@ -91,8 +91,8 @@

BOOL windowWillCloseReceived_;

BOOL windowDidResignKeyReceived_;

}

-@property(readonly) BOOL windowWillCloseReceived;

-@property(readonly) BOOL windowDidResignKeyReceived;

+@property (nonatomic, readonly) BOOL windowWillCloseReceived;

+@property (nonatomic, readonly) BOOL windowDidResignKeyReceived;

@end

@implementation BookmarkBarControllerNotificationPong

@@ -114,7 +114,7 @@

@interface BookmarkBarControllerOpenAllPong : BookmarkBarControllerNoOpen {

WindowOpenDisposition dispositionDetected_;

}

-@property WindowOpenDisposition dispositionDetected;

+@property (nonatomic) WindowOpenDisposition dispositionDetected;

@end

@implementation BookmarkBarControllerOpenAllPong

@@ -201,7 +201,7 @@ class FakeTheme : public ThemeProvider {

NSPoint dropLocation_;

NSDragOperation sourceMask_;

}

-@property (assign) NSPoint dropLocation;

+@property (nonatomic, assign) NSPoint dropLocation;

- (void)setDraggingSourceOperationMask:(NSDragOperation)mask;

@end