Mac/clang: Uncontentious fixes.

chrome/browser/cocoa/preferences_window_controller.mm

 // 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 "chrome/browser/cocoa/preferences_window_controller.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_mac.h"
@@ skipping 917 matching lines @@
   [self saveSessionStartupWithType:startupType];
 }
 
 // Returns whether or not the +/-/Current buttons should be enabled, based on
 // the current pref value for the startup urls.
 - (BOOL)enableRestoreButtons {
   return [self restoreOnStartupIndex] == SessionStartupPref::URLS;
 }
 
 // Getter for the |customPagesSource| property for bindings.
-- (id)customPagesSource {
+- (CustomHomePagesModel*)customPagesSource {
   return customPagesSource_.get();
 }
 
 // Called when the selection in the table changes. If a flag is set indicating
 // that we're waiting for a special select message, edit the cell. Otherwise
 // just ignore it, we don't normally care.
 - (void)tableViewSelectionDidChange:(NSNotification*)aNotification {
   if (pendingSelectForEdit_) {
     NSTableView* table = [aNotification object];
     NSUInteger selectedRow = [table selectedRow];
@@ skipping 1005 matching lines @@
     case OPTIONS_PAGE_ADVANCED:
       return underTheHoodView_;
     case OPTIONS_PAGE_DEFAULT:
     case OPTIONS_PAGE_COUNT:
       LOG(DFATAL) << "Invalid page value " << page;
   }
   return basicsView_;
 }
 
 @end