Nukes wrench_menu_model_chromeos and folds functionality int

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 9a3d51987c1ab3515148a7482a1c826aaa0e17d1..2db1dfe04e82bb8496c65b706bc39895726f73f1 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -429,11 +429,15 @@ 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
 
   bookmark_sub_menu_model_.reset(new BookmarkSubMenuModel(this, browser_));
   AddSubMenuWithStringId(IDC_BOOKMARKS_MENU, IDS_BOOKMARKS_MENU,
@@ -489,7 +493,8 @@ void WrenchMenuModel::Build() {
   AddItemWithStringId(IDC_SHOW_DOWNLOADS, IDS_SHOW_DOWNLOADS);
   AddSeparator();
 
-  if (browser_->profile()->GetOriginalProfile()->IsSyncAccessible()) {
+  if (browser_defaults::kShowSyncSetupMenuItem &&
+      browser_->profile()->GetOriginalProfile()->IsSyncAccessible()) {
     const string16 short_product_name =
         l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME);
     AddItem(IDC_SHOW_SYNC_SETUP, l10n_util::GetStringFUTF16(
@@ -503,17 +508,26 @@ void WrenchMenuModel::Build() {
       TaskManager::GetBackgroundPageCount());
   AddItem(IDC_VIEW_BACKGROUND_PAGES, l10n_util::GetStringFUTF16(
       IDS_VIEW_BACKGROUND_PAGES, num_background_pages));
-  AddItem(IDC_UPGRADE_DIALOG, l10n_util::GetStringUTF16(IDS_UPDATE_NOW));
+  if (browser_defaults::kShowUpgradeMenuItem)
+    AddItem(IDC_UPGRADE_DIALOG, l10n_util::GetStringUTF16(IDS_UPDATE_NOW));
   AddItem(IDC_VIEW_INCOMPATIBILITIES, l10n_util::GetStringUTF16(
       IDS_VIEW_INCOMPATIBILITIES));
 
 #if defined(OS_WIN)
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   SetIcon(GetIndexOfCommandId(IDC_VIEW_INCOMPATIBILITIES),
-          *rb.GetBitmapNamed(IDR_CONFLICT_MENU));
+          *ui::ResourceBundle::GetSharedInstance().

[tfarina, 2012/04/13 20:13:59]

nit: hum? could you revert this change?

[sky, 2012/04/13 21:45:09]

No, otherwise 524 is going to be problematic.

[tfarina, 2012/04/13 22:39:53]

OK, I see. So we have two options here:

Move rb to a upper scope, which I don't see much problem, and avoids calling
GetSharedInstance twice. Or stay with what you have, but fix the indentation to
4 spaces and fix the indentation of GetBitmapNamed?

[sky, 2012/04/13 22:54:06]

You can't move rb to upper scope since it isn't always used. I think the
indentation as I have it is fine, but if you want to change go for it.
I've already landed this.

+          GetBitmapNamed(IDR_CONFLICT_MENU));
 #endif
 
   AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE);
+  if (browser_defaults::kShowHelpMenuItemIcon) {
+    ResourceBundle& rb = ResourceBundle::GetSharedInstance();

[tfarina, 2012/04/13 20:13:59]

nit: please ui::ResourceBundle

+    SetIcon(GetIndexOfCommandId(IDC_HELP_PAGE),
+            *rb.GetBitmapNamed(IDR_HELP_MENU));
+  }
+
+  if (browser_defaults::kShowFeedbackMenuItem)
+    AddItemWithStringId(IDC_FEEDBACK, IDS_FEEDBACK);
 
   AddGlobalErrorMenuItems();
 
@@ -522,7 +536,6 @@ void WrenchMenuModel::Build() {
     AddItemWithStringId(IDC_EXIT, IDS_EXIT);
   }
 }
-#endif // !OS_CHROMEOS
 
 void WrenchMenuModel::AddGlobalErrorMenuItems() {
   // TODO(sail): Currently we only build the wrench menu once per browser