Unify the page and wrench menus into one wrench menu. Remove pref to hide men...

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 316 matching lines @@
 - (void)registerPrefObservers;
 - (void)unregisterPrefObservers;
 
 - (void)customHomePagesChanged;
 
 // KVC setter methods.
 - (void)setNewTabPageIsHomePageIndex:(NSInteger)val;
 - (void)setHomepageURL:(NSString*)urlString;
 - (void)setRestoreOnStartupIndex:(NSInteger)type;
 - (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)setAskForSaveLocation:(BOOL)value;
 - (void)setFileHandlerUIEnabled:(BOOL)value;
@@ skipping 340 matching lines @@
 - (void)registerPrefObservers {
   if (!prefs_) return;
 
   // Basics panel
   prefs_->AddPrefObserver(prefs::kURLsToRestoreOnStartup, observer_.get());
   restoreOnStartup_.Init(prefs::kRestoreOnStartup, prefs_, observer_.get());
   newTabPageIsHomePage_.Init(prefs::kHomePageIsNewTabPage,
                              prefs_, observer_.get());
   homepage_.Init(prefs::kHomePage, prefs_, observer_.get());
   showHomeButton_.Init(prefs::kShowHomeButton, prefs_, observer_.get());
-  showPageOptionButtons_.Init(prefs::kShowPageOptionsButtons, prefs_,
-                              observer_.get());
 
   // Personal Stuff panel
   askSavePasswords_.Init(prefs::kPasswordManagerEnabled,
                          prefs_, observer_.get());
   formAutofill_.Init(prefs::kAutoFillEnabled, prefs_, observer_.get());
   currentTheme_.Init(prefs::kCurrentThemeID, prefs_, observer_.get());
 
   // Under the hood panel
   alternateErrorPages_.Init(prefs::kAlternateErrorPagesEnabled,
                             prefs_, observer_.get());
@@ skipping 153 matching lines @@
     [self setNewTabPageIsHomePageIndex:useNewTabPage];
   }
   if (*prefName == prefs::kHomePage) {
     NSString* value = base::SysWideToNSString(homepage_.GetValue());
     [self setHomepageURL:value];
   }
 
   if (*prefName == prefs::kShowHomeButton) {
     [self setShowHomeButton:showHomeButton_.GetValue() ? YES : NO];
   }
-  if (*prefName == prefs::kShowPageOptionsButtons) {
-    [self setShowPageOptionsButtons:showPageOptionButtons_.GetValue() ?
-        YES : NO];
-  }
 }
 
 // Returns the index of the selected cell in the "on startup" matrix based
 // on the "restore on startup" pref. The ordering of the cells is in the
 // same order as the pref.
 - (NSInteger)restoreOnStartupIndex {
   const SessionStartupPref pref = SessionStartupPref::GetStartupPref(prefs_);
   return pref.type;
 }
 
@@ skipping 167 matching lines @@
 - (void)setShowHomeButton:(BOOL)value {
   if (value)
     [self recordUserAction:UserMetricsAction(
                            "Options_Homepage_ShowHomeButton")];
   else
     [self recordUserAction:UserMetricsAction(
                            "Options_Homepage_HideHomeButton")];
   showHomeButton_.SetValue(value ? true : false);
 }
 
-// Returns whether the page and options button should be checked based on the
-// preference.
-- (BOOL)showPageOptionsButtons {
-  return showPageOptionButtons_.GetValue() ? YES : NO;
-}
-
-// Sets the backend pref for whether or not the page and options buttons should
-// be displayed based on |value|.
-- (void)setShowPageOptionsButtons:(BOOL)value {
-  if (value)
-    [self recordUserAction:UserMetricsAction(
-                           "Options_Homepage_ShowPageOptionsButtons")];
-  else
-    [self recordUserAction:UserMetricsAction(
-                           "Options_Homepage_HidePageOptionsButtons")];
-  showPageOptionButtons_.SetValue(value ? true : false);
-}
-
 // Getter for the |searchEngineModel| property for bindings.
 - (id)searchEngineModel {
   return searchEngineModel_.get();
 }
 
 // Bindings for the search engine popup. We not binding directly to the model
 // in order to siphon off the setter so we can record the metric. If we're
 // doing it with one, might as well do it with both.
 - (NSUInteger)searchEngineSelectedIndex {
   return [searchEngineModel_ defaultIndex];
@@ skipping 887 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