Mac: Move prefs around in preparation for the content settings window.

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/browser/options_window.h"
 #include "chrome/browser/pref_member.h"
 
 class PersonalDataManagerObserver;
-@class CookiesWindowController;
 @class CustomHomePagesModel;
 @class FontLanguageSettingsController;
 class PrefObserverBridge;
 class PrefService;
 class Profile;
 class ProfileSyncService;
 @class SearchEngineListModel;
 
 // A window controller that handles the preferences window. The bulk of the
 // work is handled via Cocoa Bindings and getter/setter methods that wrap
@@ skipping 63 matching lines @@
   IBOutlet NSButton* syncButton_;
   IBOutlet NSTextField* syncStatus_;
   IBOutlet NSButton* syncLink_;
   scoped_nsobject<NSColor> syncStatusNoErrorBackgroundColor_;
   scoped_nsobject<NSColor> syncLinkNoErrorBackgroundColor_;
   scoped_nsobject<NSColor> syncErrorBackgroundColor_;
 
   // Under the hood panel
   IBOutlet NSView* underTheHoodContentView_;
   IBOutlet NSScrollView* underTheHoodScroller_;
+  IBOutlet NSButton* contentSettingsButton_;
+  IBOutlet NSButton* clearDataButton_;
   BooleanPrefMember alternateErrorPages_;
   BooleanPrefMember useSuggest_;
   BooleanPrefMember dnsPrefetch_;
   BooleanPrefMember safeBrowsing_;
   BooleanPrefMember metricsRecording_;
-  IntegerPrefMember cookieBehavior_;
   IBOutlet NSPathControl* downloadLocationControl_;
   IBOutlet NSButton* downloadLocationButton_;
   StringPrefMember defaultDownloadLocation_;
   BooleanPrefMember askForSaveLocation_;
   FontLanguageSettingsController* fontLanguageSettings_;
   StringPrefMember currentTheme_;
   IBOutlet NSButton* enableLoggingCheckbox_;
 }
 
 // Designated initializer. |profile| should not be NULL.
@@ skipping 11 matching lines @@
 - (IBAction)makeDefaultBrowser:(id)sender;
 - (IBAction)addHomepage:(id)sender;
 - (IBAction)removeSelectedHomepages:(id)sender;
 - (IBAction)useCurrentPagesAsHomepage:(id)sender;
 - (IBAction)manageSearchEngines:(id)sender;
 
 // User Data panel
 - (IBAction)showSavedPasswords:(id)sender;
 - (IBAction)showAutoFillSettings:(id)sender;
 - (IBAction)importData:(id)sender;
-- (IBAction)clearData:(id)sender;
 - (IBAction)resetThemeToDefault:(id)sender;
 - (IBAction)themesGallery:(id)sender;
 - (IBAction)doSyncAction:(id)sender;
 - (IBAction)doSyncReauthentication:(id)sender;
 
 // Under the hood
-- (IBAction)showCookies:(id)sender;
 - (IBAction)browseDownloadLocation:(id)sender;
+- (IBAction)clearData:(id)sender;
+- (IBAction)showContentSettings:(id)sender;
 - (IBAction)privacyLearnMore:(id)sender;
 - (IBAction)changeFontAndLanguageSettings:(id)sender;
 - (IBAction)showCertificates:(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;
 
@@ skipping 18 matching lines @@
 // 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