| Index: chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h
|
| diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h
|
| index 34e70328e220a3b341a84313f79faf9de2c2f060..b39953b0473150f7b2bba765b6df838ad5dd7dd8 100644
|
| --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h
|
| +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h
|
| @@ -47,11 +47,11 @@ class BookmarkModel;
|
| scoped_ptr<BookmarkEditorBaseControllerBridge> observer_;
|
| }
|
|
|
| -@property (nonatomic, copy) NSString* initialName;
|
| -@property (nonatomic, copy) NSString* displayName;
|
| -@property (nonatomic, assign) BOOL okEnabled;
|
| -@property (nonatomic, retain, readonly) NSArray* folderTreeArray;
|
| -@property (nonatomic, copy) NSArray* tableSelectionPaths;
|
| +@property(nonatomic, copy) NSString* initialName;
|
| +@property(nonatomic, copy) NSString* displayName;
|
| +@property(nonatomic, assign) BOOL okEnabled;
|
| +@property(nonatomic, retain, readonly) NSArray* folderTreeArray;
|
| +@property(nonatomic, copy) NSArray* tableSelectionPaths;
|
|
|
| // Designated initializer. Derived classes should call through to this init.
|
| - (id)initWithParentWindow:(NSWindow*)parentWindow
|
| @@ -121,10 +121,10 @@ class BookmarkModel;
|
| BOOL newFolder_;
|
| }
|
|
|
| -@property (nonatomic, copy) NSString* folderName;
|
| -@property (nonatomic, assign) const BookmarkNode* folderNode;
|
| -@property (nonatomic, retain) NSMutableArray* children;
|
| -@property (nonatomic, assign) BOOL newFolder;
|
| +@property(nonatomic, copy) NSString* folderName;
|
| +@property(nonatomic, assign) const BookmarkNode* folderNode;
|
| +@property(nonatomic, retain) NSMutableArray* children;
|
| +@property(nonatomic, assign) BOOL newFolder;
|
|
|
| // Convenience creator for adding a new folder to the editor's bookmark
|
| // structure. This folder will be added to the bookmark model when the
|
| @@ -153,7 +153,7 @@ class BookmarkModel;
|
|
|
| @interface BookmarkEditorBaseController(TestingAPI)
|
|
|
| -@property (nonatomic, readonly) BOOL okButtonEnabled;
|
| +@property(nonatomic, readonly) BOOL okButtonEnabled;
|
|
|
| // Create any newly added folders. New folders are nodes in folderTreeArray
|
| // which are marked as being new (i.e. their kFolderTreeNewFolderKey
|
|
|