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

chrome/browser/cocoa/preferences_window_controller.mm

Index: chrome/browser/cocoa/preferences_window_controller.mm
===================================================================
--- chrome/browser/cocoa/preferences_window_controller.mm	(revision 49817)
+++ chrome/browser/cocoa/preferences_window_controller.mm	(working copy)
@@ -334,7 +334,6 @@
 - (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;
@@ -695,8 +694,6 @@
                              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,
@@ -870,10 +867,6 @@
   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
@@ -1061,24 +1054,6 @@
   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();