Nukes wrench_menu_model_chromeos and folds functionality int

chrome/browser/defaults.cc

Index: chrome/browser/defaults.cc
diff --git a/chrome/browser/defaults.cc b/chrome/browser/defaults.cc
index a2a3bf5293b36a63d5250ac28f55926c84063012..6568e52725f88a5c8d6df6f2893c6d1c3da630c2 100644
--- a/chrome/browser/defaults.cc
+++ b/chrome/browser/defaults.cc
@@ -29,7 +29,11 @@ const int kMiniTabWidth = 64;
 const bool kCanToggleSystemTitleBar = false;
 const bool kRestorePopups = false;
 const bool kShowImportOnBookmarkBar = false;
-const bool kShowExitMenuItem = true;
+const bool kShowExitMenuItem = false;
+const bool kShowFeedbackMenuItem = true;
+const bool kShowHelpMenuItemIcon = true;
+const bool kShowSyncSetupMenuItem = false;
+const bool kShowUpgradeMenuItem = false;
 const bool kDownloadPageHasShowInFolder = true;
 const bool kSizeTabButtonToTopOfTabStrip = false;
 const bool kSyncAutoStarts = true;
@@ -65,6 +69,10 @@ const bool kShowExitMenuItem = false;
 #else
 const bool kShowExitMenuItem = true;
 #endif
+const bool kShowFeedbackMenuItem = false;
+const bool kShowHelpMenuItemIcon = false;
+const bool kShowSyncSetupMenuItem = true;
+const bool kShowUpgradeMenuItem = true;
 const bool kSizeTabButtonToTopOfTabStrip = false;
 const bool kSyncAutoStarts = false;
 const bool kShowOtherBrowsersInAboutMemory = true;