Mac/clang: Possibly contentious changes.

chrome/browser/cocoa/import_progress_dialog.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_IMPORT_PROGRESS_DIALOG_H_
 #define CHROME_BROWSER_IMPORT_PROGRESS_DIALOG_H_
 
 #import <Cocoa/Cocoa.h>
 
 #include "chrome/browser/importer/importer.h"
@@ skipping 33 matching lines @@
 - (IBAction)cancel:(id)sender;
 
 // Closes the dialog.
 - (void)closeDialog;
 
 // Methods called by importer_host via ImporterObserverBridge.
 - (void)ImportItemStarted:(importer::ImportItem)item;
 - (void)ImportItemEnded:(importer::ImportItem)item;
 - (void)ImportEnded;
 
-@property(retain) NSString* explanatoryText;
-@property(retain) NSString* favoritesStatusText;
-@property(retain) NSString* searchStatusText;
-@property(retain) NSString* savedPasswordStatusText;
-@property(retain) NSString* historyStatusText;
+@property (nonatomic, retain) NSString* explanatoryText;
+@property (nonatomic, retain) NSString* favoritesStatusText;
+@property (nonatomic, retain) NSString* searchStatusText;
+@property (nonatomic, retain) NSString* savedPasswordStatusText;
+@property (nonatomic, retain) NSString* historyStatusText;
 
-@property(retain) NSColor* favoritesImportEnabled;
-@property(retain) NSColor* searchImportEnabled;
-@property(retain) NSColor* passwordImportEnabled;
-@property(retain) NSColor* historyImportEnabled;
+@property (nonatomic, retain) NSColor* favoritesImportEnabled;
+@property (nonatomic, retain) NSColor* searchImportEnabled;
+@property (nonatomic, retain) NSColor* passwordImportEnabled;
+@property (nonatomic, retain) NSColor* historyImportEnabled;
 
 @end
 
 // C++ -> objc bridge for import status notifications.
 class ImporterObserverBridge : public ImporterHost::Observer {
  public:
   ImporterObserverBridge(ImportProgressDialogController* owner)
       : owner_(owner) {}
   virtual ~ImporterObserverBridge() {}
 
@@ skipping 18 matching lines @@
     [owner_ ImportEnded];
   }
 
  private:
   ImportProgressDialogController* owner_;
 
   DISALLOW_COPY_AND_ASSIGN(ImporterObserverBridge);
 };
 
 #endif  // CHROME_BROWSER_IMPORT_PROGRESS_DIALOG_H_