Mac/clang: Possibly contentious changes.

chrome/browser/cocoa/bookmark_editor_base_controller.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_COCOA_BOOKMARK_EDITOR_BASE_CONTROLLER_H_
 #define CHROME_BROWSER_COCOA_BOOKMARK_EDITOR_BASE_CONTROLLER_H_
 
 #import <Cocoa/Cocoa.h>
 
 #import "base/cocoa_protocols_mac.h"
@@ skipping 28 matching lines @@
   // An array of BookmarkFolderInfo where each item describes a folder in the
   // BookmarkNode structure.
   scoped_nsobject<NSArray> folderTreeArray_;
   // Bound to the table view giving a path to the current selections, of which
   // there should only ever be one.
   scoped_nsobject<NSArray> tableSelectionPaths_;
   // C++ bridge object that observes the BookmarkModel for me.
   scoped_ptr<BookmarkEditorBaseControllerBridge> observer_;
 }
 
-@property (copy) NSString* initialName;
-@property (copy) NSString* displayName;
-@property (assign) BOOL okEnabled;
-@property (retain, readonly) NSArray* folderTreeArray;
-@property (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
                    nibName:(NSString*)nibName
                    profile:(Profile*)profile
                     parent:(const BookmarkNode*)parent
              configuration:(BookmarkEditor::Configuration)configuration;
 
 // Run the bookmark editor as a modal sheet.  Does not block.
 - (void)runAsModalSheet;
@@ skipping 49 matching lines @@
 // but not yet committed to the bookmark structure), and an NSArray of
 // child folder BookmarkFolderInfo's following this same structure.
 @interface BookmarkFolderInfo : NSObject {
  @private
   NSString* folderName_;
   const BookmarkNode* folderNode_;  // weak
   NSMutableArray* children_;
   BOOL newFolder_;
 }
 
-@property (copy, readwrite) NSString* folderName;
-@property (assign, readwrite) const BookmarkNode* folderNode;
-@property (retain, readwrite) NSMutableArray* children;
-@property (assign, readwrite) 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
 // user accepts the dialog. |folderName| must be provided.
 + (id)bookmarkFolderInfoWithFolderName:(NSString*)folderName;
 
 // Designated initializer.  |folderName| must be provided.  For folders which
 // already exist in the bookmark model, |folderNode| and |children| (if any
 // children are already attached to this folder) must be provided and
 // |newFolder| should be NO.  For folders which the user has added during
 // this session and which have not been committed yet, |newFolder| should be
 // YES and |folderNode| and |children| should be NULL/nil.
 - (id)initWithFolderName:(NSString*)folderName
               folderNode:(const BookmarkNode*)folderNode
                 children:(NSMutableArray*)children
                newFolder:(BOOL)newFolder;
 
 // Convenience creator used during construction of the editor's bookmark
 // structure.  |folderName| and |folderNode| must be provided. |children|
 // is optional.  Private: exposed here for unit testing purposes.
 + (id)bookmarkFolderInfoWithFolderName:(NSString*)folderName
                             folderNode:(const BookmarkNode*)folderNode
                               children:(NSMutableArray*)children;
 
 @end
 
 @interface BookmarkEditorBaseController(TestingAPI)
 
-@property (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
 // dictionary item is YES).  This is called by -[ok:].
 - (void)createNewFolders;
 
 // Select the given bookmark node within the tree view.
 - (void)selectTestNodeInBrowser:(const BookmarkNode*)node;
 
 // Return the dictionary for the folder selected in the tree.
 - (BookmarkFolderInfo*)selectedFolder;
 
 @end
 
 #endif  // CHROME_BROWSER_COCOA_BOOKMARK_EDITOR_BASE_CONTROLLER_H_