For Touch: remove some menu items for experimentation, adjust sizes.

chrome/browser/ui/toolbar/wrench_menu_model.cc

Index: chrome/browser/ui/toolbar/wrench_menu_model.cc
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc
index f785a58771c2939d21e7efa1f15b492082c4406f..4e4dc6fcb45dfbf0397b0c3aeda9cab67263225b 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -406,15 +406,11 @@ WrenchMenuModel::WrenchMenuModel()
       tabstrip_model_(NULL) {
 }
 
+#if !defined(OS_CHROMEOS)
 void WrenchMenuModel::Build() {
   AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB);
   AddItemWithStringId(IDC_NEW_WINDOW, IDS_NEW_WINDOW);
-#if defined(OS_CHROMEOS)
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession))
-    AddItemWithStringId(IDC_NEW_INCOGNITO_WINDOW, IDS_NEW_INCOGNITO_WINDOW);
-#else
   AddItemWithStringId(IDC_NEW_INCOGNITO_WINDOW, IDS_NEW_INCOGNITO_WINDOW);
-#endif
 
   AddSeparator();
 #if defined(OS_POSIX) && !defined(TOOLKIT_VIEWS)
@@ -469,7 +465,6 @@ void WrenchMenuModel::Build() {
   AddItemWithStringId(IDC_SHOW_DOWNLOADS, IDS_SHOW_DOWNLOADS);
   AddSeparator();
 
-#if !defined(OS_CHROMEOS)
   if (browser_->profile()->GetOriginalProfile()->IsSyncAccessible()) {
     const string16 short_product_name =
         l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME);
@@ -477,11 +472,8 @@ void WrenchMenuModel::Build() {
         IDS_SHOW_SYNC_SETUP, short_product_name));
     AddSeparator();
   }
-#endif
 
-#if defined(OS_CHROMEOS)
-  AddItemWithStringId(IDC_OPTIONS, IDS_SETTINGS);
-#elif defined(OS_MACOSX)
+#if defined(OS_MACOSX)
   AddItemWithStringId(IDC_OPTIONS, IDS_PREFERENCES);
 #elif defined(TOOLKIT_USES_GTK)
   string16 preferences = gtk_util::GetStockPreferencesMenuLabel();
@@ -493,11 +485,7 @@ void WrenchMenuModel::Build() {
   AddItemWithStringId(IDC_OPTIONS, IDS_OPTIONS);
 #endif
 
-#if defined(OS_CHROMEOS)
-  const string16 product_name = l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME);
-#else
   const string16 product_name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
-#endif
   AddItem(IDC_ABOUT, l10n_util::GetStringFUTF16(IDS_ABOUT, product_name));
   string16 num_background_pages = base::FormatNumber(
       TaskManager::GetBackgroundPageCount());
@@ -515,29 +503,13 @@ void WrenchMenuModel::Build() {
 #endif
 
   AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE);
-#if defined(OS_CHROMEOS)
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  // Use an icon for IDC_HELP_PAGE menu item.
-  SetIcon(GetIndexOfCommandId(IDC_HELP_PAGE),
-          *rb.GetBitmapNamed(IDR_HELP_MENU));
-
-  // Show IDC_FEEDBACK in top-tier wrench menu for ChromeOS.
-  AddItemWithStringId(IDC_FEEDBACK, IDS_FEEDBACK);
-#endif
 
   if (browser_defaults::kShowExitMenuItem) {
     AddSeparator();
-#if defined(OS_CHROMEOS)
-    if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession)) {
-      AddItemWithStringId(IDC_EXIT, IDS_EXIT_GUEST_MODE);
-    } else {
-      AddItemWithStringId(IDC_EXIT, IDS_SIGN_OUT);
-    }
-#else
     AddItemWithStringId(IDC_EXIT, IDS_EXIT);
-#endif
   }
 }
+#endif // !OS_CHROMEOS
 
 void WrenchMenuModel::CreateCutCopyPaste() {
   // WARNING: views/wrench_menu assumes these items are added in this order. If