Reverting 30702 - Which was a Revert of 30696....

chrome/browser/cocoa/preferences_window_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 "base/scoped_ptr.h"
 #include "base/scoped_nsobject.h"
 #include "chrome/common/pref_member.h"
 
@@ skipping 23 matching lines @@
 
   IBOutlet NSToolbar* toolbar_;
 
   // The views we'll rotate through
   IBOutlet NSView* basicsView_;
   IBOutlet NSView* personalStuffView_;
   IBOutlet NSView* underTheHoodView_;
   // The last page the user was on when they opened the Options window.
   IntegerPrefMember lastSelectedPage_;
 
+  // The groups of the Basics view for layout fixup.
+  IBOutlet NSArray* basicsGroupStartup_;
+  IBOutlet NSArray* basicsGroupHomePage_;
+  IBOutlet NSArray* basicsGroupToolbar_;
+  IBOutlet NSArray* basicsGroupSearchEngine_;
+  IBOutlet NSArray* basicsGroupDefaultBrowser_;
+
+  // The groups of the Personal Stuff view for layout fixup.
+  IBOutlet NSArray* personalStuffGroupPasswords_;
+  IBOutlet NSArray* personalStuffGroupAutofill_;
+  IBOutlet NSArray* personalStuffGroupBrowserData_;
+  IBOutlet NSArray* personalStuffGroupThemes_;
+
   // Having two animations around is bad (they fight), so just use one.
   scoped_nsobject<NSViewAnimation> animation_;
 
   IBOutlet NSArrayController* customPagesArrayController_;
 
   // Basics panel
   IntegerPrefMember restoreOnStartup_;
   scoped_nsobject<CustomHomePagesModel> customPagesSource_;
   BooleanPrefMember newTabPageIsHomePage_;
   StringPrefMember homepage_;
@@ skipping 51 matching lines @@
 // 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;
 
 // NSNotification sent when the prefs window is closed.
 extern NSString* const kUserDoneEditingPrefsNotification;
 
 @end