Mac/clang: Possibly contentious changes.

chrome/browser/cocoa/keyword_editor_cocoa_controller.h

 // Copyright (c) 2009 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "app/table_model_observer.h"
 #import "base/cocoa_protocols_mac.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/cocoa/table_row_nsimage_cache.h"
@@ skipping 63 matching lines @@
   IBOutlet NSButton* makeDefaultButton_;
 
   scoped_nsobject<NSTextFieldCell> groupCell_;
 
   Profile* profile_;  // weak
   scoped_ptr<KeywordEditorController> controller_;
   scoped_ptr<KeywordEditorModelObserver> observer_;
 
   scoped_nsobject<WindowSizeAutosaver> sizeSaver_;
 }
-@property (readonly) KeywordEditorController* controller;
+@property (nonatomic, readonly) KeywordEditorController* controller;
 
 // Show the keyword editor associated with the given profile (or the
 // original profile if this is an incognito profile).  If no keyword
 // editor exists for this profile, create one and show it.  Any
 // resulting editor releases itself when closed.
 + (void)showKeywordEditor:(Profile*)profile;
 
 - (KeywordEditorController*)controller;
 
 // Message forwarded by KeywordEditorModelObserver.
@@ skipping 12 matching lines @@
 
 // Returns a reference to the shared instance for the given profile,
 // or nil if there is none.
 + (KeywordEditorCocoaController*)sharedInstanceForProfile:(Profile*)profile;
 
 // Converts a row index in our table view (which has group header rows) into
 // one in the |controller_|'s model, which does not have them.
 - (int)indexInModelForRow:(NSUInteger)row;
 
 @end