Mac/clang: Possibly contentious changes.

chrome/browser/cocoa/preferences_window_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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/scoped_ptr.h"
 #include "base/scoped_nsobject.h"
 #include "chrome/browser/options_window.h"
 #include "chrome/browser/pref_member.h"
@@ skipping 143 matching lines @@
 - (IBAction)resetAutoOpenFiles:(id)sender;
 - (IBAction)changeFontAndLanguageSettings:(id)sender;
 - (IBAction)openProxyPreferences:(id)sender;
 - (IBAction)showCertificates:(id)sender;
 - (IBAction)resetToDefaults:(id)sender;
 
 // When a toolbar button is clicked
 - (IBAction)toolbarButtonSelected:(id)sender;
 
 // Usable from cocoa bindings to hook up the custom home pages table.
-@property(readonly) CustomHomePagesModel* customPagesSource;
+@property (nonatomic, readonly) CustomHomePagesModel* customPagesSource;
 
 @end
 
 @interface PreferencesWindowController(Testing)
 
 - (IntegerPrefMember*)lastSelectedPage;
 - (NSToolbar*)toolbar;
 - (NSView*)basicsView;
 - (NSView*)personalStuffView;
 - (NSView*)underTheHoodView;
 
 // Converts the given OptionsPage value (which may be OPTIONS_PAGE_DEFAULT)
 // into a concrete OptionsPage value.
 - (OptionsPage)normalizePage:(OptionsPage)page;
 
 // Returns the toolbar item corresponding to the given page.  Should be
 // called only after awakeFromNib is.
 - (NSToolbarItem*)getToolbarItemForPage:(OptionsPage)page;
 
 // Returns the (normalized) page corresponding to the given toolbar item.
 // Should be called only after awakeFromNib is.
 - (OptionsPage)getPageForToolbarItem:(NSToolbarItem*)toolbarItem;
 
 // Returns the view corresponding to the given page.  Should be called
 // only after awakeFromNib is.
 - (NSView*)getPrefsViewForPage:(OptionsPage)page;
 
 @end