Use different help URLs for menus, accelerators, and WebUI.

chrome/browser/app_controller_mac.mm

 // 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.
 
 #import "chrome/browser/app_controller_mac.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 873 matching lines @@
         browser->ShowDownloadsTab();
       else
         Browser::OpenDownloadsWindow(lastProfile);
       break;
     case IDC_MANAGE_EXTENSIONS:
       if (Browser* browser = ActivateBrowser(lastProfile))
         browser->ShowExtensionsTab();
       else
         Browser::OpenExtensionsWindow(lastProfile);
       break;
-    case IDC_HELP_PAGE:
+    case IDC_HELP_PAGE_VIA_KEYBOARD:
+    case IDC_HELP_PAGE_VIA_MENU: {
+      Browser::HelpSource source = (tag == IDC_HELP_PAGE_VIA_KEYBOARD) ?
+                                   Browser::HELP_SOURCE_KEYBOARD :
+                                   Browser::HELP_SOURCE_MENU;
       if (Browser* browser = ActivateBrowser(lastProfile))
-        browser->ShowHelpTab();
+        browser->ShowHelpTab(source);
       else
-        Browser::OpenHelpWindow(lastProfile);
+        Browser::OpenHelpWindow(lastProfile, source);
       break;
+    }
     case IDC_SHOW_SYNC_SETUP:
       if (Browser* browser = ActivateBrowser(lastProfile))
         browser->ShowSyncSetup(SyncPromoUI::SOURCE_MENU);
       else
         Browser::OpenSyncSetupWindow(lastProfile, SyncPromoUI::SOURCE_MENU);
       break;
     case IDC_TASK_MANAGER:
       content::RecordAction(UserMetricsAction("TaskManager"));
       TaskManagerMac::Show(false);
       break;
@@ skipping 107 matching lines @@
   menuState_->UpdateCommandEnabled(IDC_NEW_INCOGNITO_WINDOW, true);
   menuState_->UpdateCommandEnabled(IDC_OPEN_FILE, true);
   menuState_->UpdateCommandEnabled(IDC_CLEAR_BROWSING_DATA, true);
   menuState_->UpdateCommandEnabled(IDC_RESTORE_TAB, false);
   menuState_->UpdateCommandEnabled(IDC_FOCUS_LOCATION, true);
   menuState_->UpdateCommandEnabled(IDC_FOCUS_SEARCH, true);
   menuState_->UpdateCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER, true);
   menuState_->UpdateCommandEnabled(IDC_SHOW_HISTORY, true);
   menuState_->UpdateCommandEnabled(IDC_SHOW_DOWNLOADS, true);
   menuState_->UpdateCommandEnabled(IDC_MANAGE_EXTENSIONS, true);
-  menuState_->UpdateCommandEnabled(IDC_HELP_PAGE, true);
+  menuState_->UpdateCommandEnabled(IDC_HELP_PAGE_VIA_MENU, true);

[Daniel Erat, 2012/06/08 21:07:11]

Should I also be calling this for IDC_HELP_PAGE_VIA_KEYBOARD?  Is there an
additional file that I should be editing for Mac?

[Avi (use Gerrit), 2012/06/11 20:54:06]

There's no "help" keyboard shortcut on the Mac; I don't know how
IDC_HELP_PAGE_VIA_KEYBOARD would be triggered.

[Daniel Erat, 2012/06/11 21:05:37]

Thanks, that answers it.  I've removed IDC_HELP_PAGE_VIA_KEYBOARD from
commandDispatch.

   menuState_->UpdateCommandEnabled(IDC_IMPORT_SETTINGS, true);
   menuState_->UpdateCommandEnabled(IDC_FEEDBACK, true);
   menuState_->UpdateCommandEnabled(IDC_SHOW_SYNC_SETUP, true);
   menuState_->UpdateCommandEnabled(IDC_TASK_MANAGER, true);
 }
 
 // Conditionally adds the Profile menu to the main menu bar.
 - (void)initProfileMenu {
   NSMenu* mainMenu = [NSApp mainMenu];
   NSMenuItem* profileMenu = [mainMenu itemWithTag:IDC_PROFILE_MAIN_MENU];
@@ skipping 280 matching lines @@
 
 }  // namespace browser
 
 namespace app_controller_mac {
 
 bool IsOpeningNewWindow() {
   return g_is_opening_new_window;
 }
 
 }  // namespace app_controller_mac