Add Help wrench submenu

chrome/browser/ui/toolbar/wrench_menu_model.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/command_line.h"
@@ skipping 161 matching lines @@
 ZoomMenuModel::~ZoomMenuModel() {
 }
 
 void ZoomMenuModel::Build() {
   AddItemWithStringId(IDC_ZOOM_PLUS, IDS_ZOOM_PLUS);
   AddItemWithStringId(IDC_ZOOM_NORMAL, IDS_ZOOM_NORMAL);
   AddItemWithStringId(IDC_ZOOM_MINUS, IDS_ZOOM_MINUS);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// HelpMenuModel
+
+#if defined(GOOGLE_CHROME_BUILD)
+
+class WrenchMenuModel::HelpMenuModel : public ui::SimpleMenuModel {
+ public:
+  HelpMenuModel(ui::SimpleMenuModel::Delegate* delegate,
+                Browser* browser)
+      : SimpleMenuModel(delegate) {
+    Build(browser);
+  }
+  virtual ~HelpMenuModel() {
+  }
+
+ private:
+  void Build(Browser* browser) {
+    int help_string_id = IDS_HELP_PAGE;
+#if defined(OS_CHROMEOS)
+    if (!CommandLine::ForCurrentProcess()->HasSwitch(
+            chromeos::switches::kDisableGeniusApp)) {
+      help_string_id = IDS_GENIUS_APP_NAME;
+    }
+#endif
+    AddItemWithStringId(IDC_HELP_PAGE_VIA_MENU, help_string_id);
+    if (browser_defaults::kShowHelpMenuItemIcon) {
+      ui::ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+      SetIcon(GetIndexOfCommandId(IDC_HELP_PAGE_VIA_MENU),
+              rb.GetNativeImageNamed(IDR_HELP_MENU));
+    }
+
+    AddItemWithStringId(IDC_FEEDBACK, IDS_FEEDBACK);
+  }
+
+  DISALLOW_COPY_AND_ASSIGN(HelpMenuModel);
+};
+
+#endif  // defined(GOOGLE_CHROME_BUILD)
+
+////////////////////////////////////////////////////////////////////////////////
 // ToolsMenuModel
 
 ToolsMenuModel::ToolsMenuModel(ui::SimpleMenuModel::Delegate* delegate,
                                Browser* browser)
     : SimpleMenuModel(delegate) {
   Build(browser);
 }
 
 ToolsMenuModel::~ToolsMenuModel() {}
 
@@ skipping 17 matching lines @@
 
   AddItemWithStringId(IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS);
 
   if (chrome::CanOpenTaskManager())
     AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
 
   AddItemWithStringId(IDC_CLEAR_BROWSING_DATA, IDS_CLEAR_BROWSING_DATA);
 
   AddSeparator(ui::NORMAL_SEPARATOR);
 
-#if defined(GOOGLE_CHROME_BUILD)
-#if !defined(OS_CHROMEOS)
-  // Show IDC_FEEDBACK in "Tools" menu for non-ChromeOS platforms.
-  AddItemWithStringId(IDC_FEEDBACK, IDS_FEEDBACK);
-  AddSeparator(ui::NORMAL_SEPARATOR);
-#endif
-#endif // GOOGLE_CHROME_BUILD
-
   encoding_menu_model_.reset(new EncodingMenuModel(browser));
   AddSubMenuWithStringId(IDC_ENCODING_MENU, IDS_ENCODING_MENU,
                          encoding_menu_model_.get());
   AddItemWithStringId(IDC_VIEW_SOURCE, IDS_VIEW_SOURCE);
   AddItemWithStringId(IDC_DEV_TOOLS, IDS_DEV_TOOLS);
   AddItemWithStringId(IDC_DEV_TOOLS_CONSOLE, IDS_DEV_TOOLS_CONSOLE);
   AddItemWithStringId(IDC_DEV_TOOLS_DEVICES, IDS_DEV_TOOLS_DEVICES);
 
 #if defined(ENABLE_PROFILING) && !defined(NO_TCMALLOC)
   AddSeparator(ui::NORMAL_SEPARATOR);
@@ skipping 359 matching lines @@
           l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME);
       AddItem(IDC_SHOW_SYNC_SETUP, l10n_util::GetStringFUTF16(
           IDS_SYNC_MENU_PRE_SYNCED_LABEL, short_product_name));
       AddSeparator(ui::NORMAL_SEPARATOR);
     }
   }
 #endif
 
   AddItemWithStringId(IDC_OPTIONS, IDS_SETTINGS);
 
+#if defined(GOOGLE_CHROME_BUILD)
+  help_menu_model_.reset(new HelpMenuModel(this, browser_));
+  AddSubMenuWithStringId(IDC_HELP_MENU, IDS_HELP_MENU,
+                         help_menu_model_.get());
+  AddSeparator(ui::NORMAL_SEPARATOR);
+#endif
+
 #if defined(OS_CHROMEOS)
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kEnableRequestTabletSite))
     AddCheckItemWithStringId(IDC_TOGGLE_REQUEST_TABLET_SITE,
                              IDS_TOGGLE_REQUEST_TABLET_SITE);
 #endif
 
-// On ChromeOS-Touch, we don't want the about menu option.
-#if defined(OS_CHROMEOS)
-  if (!is_new_menu)
-#endif
-  {
-    AddItem(IDC_ABOUT, l10n_util::GetStringUTF16(IDS_ABOUT));
-  }
-
   if (browser_defaults::kShowUpgradeMenuItem)
     AddItem(IDC_UPGRADE_DIALOG, GetUpgradeDialogMenuItemName());
 
 #if defined(OS_WIN)
   SetIcon(GetIndexOfCommandId(IDC_VIEW_INCOMPATIBILITIES),
           ui::ResourceBundle::GetSharedInstance().
               GetNativeImageNamed(IDR_INPUT_ALERT_MENU));
 #endif
 
-  if (!is_new_menu) {
-    AddItemWithStringId(IDC_HELP_PAGE_VIA_MENU, IDS_HELP_PAGE);
-
-    if (browser_defaults::kShowHelpMenuItemIcon) {
-      ui::ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-      SetIcon(GetIndexOfCommandId(IDC_HELP_PAGE_VIA_MENU),
-              rb.GetNativeImageNamed(IDR_HELP_MENU));
-    }
-  }
-
-#if defined(GOOGLE_CHROME_BUILD)
-#if defined(OS_CHROMEOS)
-  AddItemWithStringId(IDC_FEEDBACK, IDS_FEEDBACK);
-#endif
-#endif
-
   AddGlobalErrorMenuItems();
 
   if (is_new_menu) {
     AddSubMenuWithStringId(IDC_ZOOM_MENU, IDS_MORE_TOOLS_MENU,
                            tools_menu_model_.get());
   }
 
   bool show_exit_menu = browser_defaults::kShowExitMenuItem;
 #if defined(OS_WIN)
   if (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH)
     show_exit_menu = false;
 #endif
 
   if (show_exit_menu) {
     AddSeparator(ui::NORMAL_SEPARATOR);
     AddItemWithStringId(IDC_EXIT, IDS_EXIT);
   }
+
+  RemoveTrailingSeparators();
 }
 
 void WrenchMenuModel::AddGlobalErrorMenuItems() {
   // TODO(sail): Currently we only build the wrench menu once per browser
   // window. This means that if a new error is added after the menu is built
   // it won't show in the existing wrench menu. To fix this we need to some
   // how update the menu if new errors are added.
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   // GetSignedInServiceErrors() can modify the global error list, so call it
   // before iterating through that list below.
@@ skipping 98 matching lines @@
             &enable_increment, &enable_decrement);
   }
   zoom_label_ = l10n_util::GetStringFUTF16(
       IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
 }
 
 void WrenchMenuModel::OnZoomLevelChanged(
     const content::HostZoomMap::ZoomLevelChange& change) {
   UpdateZoomControls();
 }