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

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"

[viettrungluu, 2010/02/22 00:57:40]

There should really be a blank line before this one.

 #include "app/l10n_util_mac.h"
 #include "base/logging.h"
 #include "base/mac_util.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/autofill/autofill_dialog.h"
 #include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #import "chrome/browser/cocoa/clear_browsing_data_controller.h"
-#import "chrome/browser/cocoa/cookies_window_controller.h"
+#import "chrome/browser/cocoa/content_settings_dialog_controller.h"
 #import "chrome/browser/cocoa/custom_home_pages_model.h"
 #import "chrome/browser/cocoa/font_language_settings_controller.h"
 #import "chrome/browser/cocoa/import_settings_dialog.h"
 #import "chrome/browser/cocoa/keyword_editor_cocoa_controller.h"
 #import "chrome/browser/cocoa/search_engine_list_model.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/net/dns_global.h"
 #include "chrome/browser/net/url_fixer_upper.h"
@@ skipping 271 matching lines @@
 
 // Simply removes all the views in |toRemove|.
 void RemoveGroupFromView(NSView* view, NSArray* toRemove) {
   for (NSView* viewToRemove in toRemove) {
     RemoveViewFromView(view, viewToRemove);
   }
 }
 
 // Helper to tweak the layout of the "Under the Hood" content by autosizing all
 // the views and moving things up vertically.  Special case the two controls for
-// download location as they are horizontal, and should fill the row.
+// download location as they are horizontal, and should fill the row. Special
+// case "Content Settings" and "Clear browsing data" as they are horizontal as
+// well.
 CGFloat AutoSizeUnderTheHoodContent(NSView* view,
+                                    NSButton* contentSettingsButton,
+                                    NSButton* clearDataButton,
                                     NSPathControl* downloadLocationControl,
                                     NSButton* downloadLocationButton) {
   CGFloat verticalShift = 0.0;
 
   // Loop bottom up through the views sizing and shifting.
   NSArray* views =
       [[view subviews] sortedArrayUsingFunction:CompareFrameY context:NULL];
   for (NSView* view in views) {
     NSSize delta = WrapOrSizeToFit(view);
     DCHECK_GE(delta.height, 0.0) << "Should NOT shrink in height";
     if (verticalShift) {
       NSPoint origin = [view frame].origin;
       origin.y += verticalShift;
       [view setFrameOrigin:origin];
     }
     verticalShift += delta.height;
 
+    // "Content Settings" and "Clear Browsing Data" are horizontally aligned.
+    if (view == contentSettingsButton) {
+      NSPoint origin = [clearDataButton frame].origin;
+      origin.x += delta.width;
+      [clearDataButton setFrameOrigin:origin];
+    }
+
     // The Download Location controls go in a row with the button aligned to the
     // right edge and the path control using all the rest of the space.
     if (view == downloadLocationButton) {
       NSPoint origin = [downloadLocationButton frame].origin;
       origin.x -= delta.width;
       [downloadLocationButton setFrameOrigin:origin];
       NSSize controlSize = [downloadLocationControl frame].size;
       controlSize.width -= delta.width;
       [downloadLocationControl setFrameSize:controlSize];
     }
@@ skipping 27 matching lines @@
 - (void)setShowHomeButton:(BOOL)value;
 - (void)setShowPageOptionsButtons:(BOOL)value;
 - (void)setPasswordManagerEnabledIndex:(NSInteger)value;
 - (void)setFormAutofillEnabledIndex:(NSInteger)value;
 - (void)setIsUsingDefaultTheme:(BOOL)value;
 - (void)setShowAlternateErrorPages:(BOOL)value;
 - (void)setUseSuggest:(BOOL)value;
 - (void)setDnsPrefetch:(BOOL)value;
 - (void)setSafeBrowsing:(BOOL)value;
 - (void)setMetricsRecording:(BOOL)value;
-- (void)setCookieBehavior:(NSInteger)value;
 - (void)setAskForSaveLocation:(BOOL)value;
 - (void)displayPreferenceViewForPage:(OptionsPage)page
                              animate:(BOOL)animate;
 @end
 
 // A C++ class registered for changes in preferences. Bridges the
 // notification back to the PWC.
 class PrefObserverBridge : public NotificationObserver,
                            public ProfileSyncServiceObserver {
  public:
@@ skipping 318 matching lines @@
   [underTheHoodView_ setFrameSize:underTheHoodSize];
 
   // Widen the Under the Hood content so things can rewrap to the full width.
   NSSize underTheHoodContentSize = [underTheHoodContentView_ frame].size;
   underTheHoodContentSize.width = [underTheHoodScroller_ contentSize].width;
   [underTheHoodContentView_ setFrameSize:underTheHoodContentSize];
 
   // Now that Under the Hood is the right width, auto-size to the new width to
   // get the final height.
   verticalShift = AutoSizeUnderTheHoodContent(underTheHoodContentView_,
+                                              contentSettingsButton_,
+                                              clearDataButton_,
                                               downloadLocationControl_,
                                               downloadLocationButton_);
   [GTMUILocalizerAndLayoutTweaker
       resizeViewWithoutAutoResizingSubViews:underTheHoodContentView_
                                       delta:NSMakeSize(0.0, verticalShift)];
   underTheHoodContentSize = [underTheHoodContentView_ frame].size;
 
   // Put the Under the Hood content view into the scroller and scroll it to the
   // top.
   [underTheHoodScroller_ setDocumentView:underTheHoodContentView_];
@@ skipping 55 matching lines @@
   safeBrowsing_.Init(prefs::kSafeBrowsingEnabled, prefs_, observer_.get());
 
   // During unit tests, there is no local state object, so we fall back to
   // the prefs object (where we've explicitly registered this pref so we
   // know it's there).
   PrefService* local = g_browser_process->local_state();
   if (!local)
     local = prefs_;
   metricsRecording_.Init(prefs::kMetricsReportingEnabled,
                          local, observer_.get());
-  cookieBehavior_.Init(prefs::kCookieBehavior, prefs_, observer_.get());
   defaultDownloadLocation_.Init(prefs::kDownloadDefaultDirectory, prefs_,
                                 observer_.get());
   askForSaveLocation_.Init(prefs::kPromptForDownload, prefs_, observer_.get());
 
   // We don't need to observe changes in this value.
   lastSelectedPage_.Init(prefs::kOptionsWindowLastTabIndex, local, NULL);
 }
 
 // Clean up what was registered in -registerPrefObservers. We only have to
 // clean up the non-PrefMember registrations.
@@ skipping 444 matching lines @@
     personalDataManager->SetObserver(personalDataManagerObserver_.get());
   }
 }
 
 // Called to import data from other browsers (Safari, Firefox, etc).
 - (IBAction)importData:(id)sender {
   UserMetrics::RecordAction("Import_ShowDlg", profile_);
   [ImportSettingsDialogController showImportSettingsDialogForProfile:profile_];
 }
 
-// Called to clear user's browsing data. This puts up an application-modal
-// dialog to guide the user through clearing the data.
-- (IBAction)clearData:(id)sender {
-  [ClearBrowsingDataController
-      showClearBrowsingDialogForProfile:profile_];
-}
-
 - (IBAction)resetThemeToDefault:(id)sender {
   [self recordUserAction:"Options_ThemesReset"];
   profile_->ClearTheme();
 }
 
 - (IBAction)themesGallery:(id)sender {
   [self recordUserAction:"Options_ThemesGallery"];
   Browser* browser =
       BrowserList::FindBrowserWithType(profile_, Browser::TYPE_NORMAL);
 
@@ skipping 111 matching lines @@
   }
   else if (*prefName == prefs::kDnsPrefetchingEnabled) {
     [self setDnsPrefetch:dnsPrefetch_.GetValue() ? YES : NO];
   }
   else if (*prefName == prefs::kSafeBrowsingEnabled) {
     [self setSafeBrowsing:safeBrowsing_.GetValue() ? YES : NO];
   }
   else if (*prefName == prefs::kMetricsReportingEnabled) {
     [self setMetricsRecording:metricsRecording_.GetValue() ? YES : NO];
   }
-  else if (*prefName == prefs::kCookieBehavior) {
-    [self setCookieBehavior:cookieBehavior_.GetValue()];
-  }
   else if (*prefName == prefs::kPromptForDownload) {
     [self setAskForSaveLocation:askForSaveLocation_.GetValue() ? YES : NO];
   }
 }
 
 // Set the new download path and notify the UI via KVO.
 - (void)downloadPathPanelDidEnd:(NSOpenPanel*)panel
                            code:(NSInteger)returnCode
                         context:(void*)context {
   if (returnCode == NSOKButton) {
     [self recordUserAction:"Options_SetDownloadDirectory"];
     NSURL* path = [[panel URLs] lastObject];  // We only allow 1 item.
     [self willChangeValueForKey:@"defaultDownloadLocation"];
     defaultDownloadLocation_.SetValue(base::SysNSStringToWide([path path]));
     [self didChangeValueForKey:@"defaultDownloadLocation"];
   }
 }
 
-// Shows the cookies controller.
-- (IBAction)showCookies:(id)sender {
-  // The controller will clean itself up.
-  BrowsingDataDatabaseHelper* databaseHelper =
-      new BrowsingDataDatabaseHelper(profile_);
-  BrowsingDataLocalStorageHelper* storageHelper =
-      new BrowsingDataLocalStorageHelper(profile_);
-  CookiesWindowController* controller =
-      [[CookiesWindowController alloc] initWithProfile:profile_
-                                        databaseHelper:databaseHelper
-                                         storageHelper:storageHelper];
-  [controller attachSheetTo:[self window]];
-}
-
 // Bring up an open panel to allow the user to set a new downloads location.
 - (void)browseDownloadLocation:(id)sender {
   NSOpenPanel* panel = [NSOpenPanel openPanel];
   [panel setAllowsMultipleSelection:NO];
   [panel setCanChooseFiles:NO];
   [panel setCanChooseDirectories:YES];
   NSString* path = base::SysWideToNSString(defaultDownloadLocation_.GetValue());
   [panel beginSheetForDirectory:path
                            file:nil
                           types:nil
                  modalForWindow:[self window]
                   modalDelegate:self
                  didEndSelector:@selector(downloadPathPanelDidEnd:code:context:)
                     contextInfo:NULL];
 }
 
+// Called to clear user's browsing data. This puts up an application-modal
+// dialog to guide the user through clearing the data.
+- (IBAction)clearData:(id)sender {
+  [ClearBrowsingDataController
+      showClearBrowsingDialogForProfile:profile_];
+}
+
+// Opens the "Content Settings" dialog.
+- (IBAction)showContentSettings:(id)sender {
+  [ContentSettingsDialogController
+      showContentSettingsForType:CONTENT_SETTINGS_TYPE_DEFAULT
+                         profile:profile_];
+}
+
 - (IBAction)privacyLearnMore:(id)sender {
   // We open a new browser window so the Options dialog doesn't get lost
   // behind other windows.
   Browser* browser = Browser::Create(profile_);
   browser->OpenURL(GURL(l10n_util::GetStringUTF16(IDS_LEARN_MORE_PRIVACY_URL)),
                    GURL(), NEW_WINDOW, PageTransition::LINK);
 }
 
 // Returns whether the alternate error page checkbox should be checked based
 // on the preference.
@@ skipping 99 matching lines @@
       metrics->Start();
     else
       metrics->Stop();
   }
 
   // TODO(pinkerton): windows shows a dialog here telling the user they need to
   // restart for this to take effect. http://crbug.com/34653
   metricsRecording_.SetValue(enabled);
 }
 
-// Returns the index of the cookie popup based on the preference.
-- (NSInteger)cookieBehavior {
-  return cookieBehavior_.GetValue();
-}
-
-// Sets the backend pref for whether or not to accept cookies based on |index|.
-- (void)setCookieBehavior:(NSInteger)index {
-  // TODO(darin): Remove everything else related to this setter.
-  // http://crbug.com/34656
-}
-
 - (NSURL*)defaultDownloadLocation {
   NSString* pathString =
       base::SysWideToNSString(defaultDownloadLocation_.GetValue());
   return [NSURL fileURLWithPath:pathString];
 }
 
 - (BOOL)askForSaveLocation {
   return askForSaveLocation_.GetValue();
 }
 
@@ skipping 312 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