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

chrome/browser/ui/browser.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/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 672 matching lines @@
 }
 
 // static
 void Browser::OpenDownloadsWindow(Profile* profile) {
   Browser* browser = Browser::Create(profile);
   browser->ShowDownloadsTab();
   browser->window()->Show();
 }
 
 // static
-void Browser::OpenHelpWindow(Profile* profile) {
+void Browser::OpenHelpWindow(Profile* profile, HelpSource source) {
   Browser* browser = Browser::Create(profile);
-  browser->ShowHelpTab();
+  browser->ShowHelpTab(source);
   browser->window()->Show();
 }
 
 // static
 void Browser::OpenOptionsWindow(Profile* profile) {
   Browser* browser = Browser::Create(profile);
   browser->OpenOptionsDialog();
   browser->window()->Show();
 }
 
@@ skipping 1275 matching lines @@
   // crbug.com/115123.
   window_->ShowAboutChromeDialog();
 #endif
 }
 
 void Browser::OpenUpdateChromeDialog() {
   content::RecordAction(UserMetricsAction("UpdateChrome"));
   window_->ShowUpdateChromeDialog();
 }
 
-void Browser::ShowHelpTab() {
+void Browser::ShowHelpTab(HelpSource source) {
   content::RecordAction(UserMetricsAction("ShowHelpTab"));
-  ShowSingletonTab(GURL(chrome::kChromeHelpURL));
+  GURL url;
+  switch (source) {
+    case HELP_SOURCE_KEYBOARD:
+      url = GURL(chrome::kChromeHelpViaKeyboardURL);
+      break;
+    case HELP_SOURCE_MENU:
+      url = GURL(chrome::kChromeHelpViaMenuURL);
+      break;
+    case HELP_SOURCE_WEBUI:
+      url = GURL(chrome::kChromeHelpViaWebUIURL);
+      break;
+    default:
+      NOTREACHED() << "Unhandled help source " << source;
+  }
+  ShowSingletonTab(url);
 }
 
 void Browser::OpenPrivacyDashboardTabAndActivate() {
   OpenURL(OpenURLParams(
       GURL(kPrivacyDashboardUrl), Referrer(),
       NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false));
   window_->Activate();
 }
 
 void Browser::OpenSearchEngineOptionsDialog() {
@@ skipping 476 matching lines @@
     case IDC_SELECT_TAB_4:
     case IDC_SELECT_TAB_5:
     case IDC_SELECT_TAB_6:
     case IDC_SELECT_TAB_7:          SelectNumberedTab(id - IDC_SELECT_TAB_0);
                                                                       break;
     case IDC_SELECT_LAST_TAB:       SelectLastTab();                  break;
     case IDC_DUPLICATE_TAB:         DuplicateTab();                   break;
     case IDC_RESTORE_TAB:           RestoreTab();                     break;
     case IDC_COPY_URL:              WriteCurrentURLToClipboard();     break;
     case IDC_SHOW_AS_TAB:           ConvertPopupToTabbedBrowser();    break;
-    case IDC_FULLSCREEN:            ToggleFullscreenMode();      break;
+    case IDC_FULLSCREEN:            ToggleFullscreenMode();           break;
 #if defined(OS_MACOSX)
-    case IDC_PRESENTATION_MODE:     TogglePresentationMode();    break;
+    case IDC_PRESENTATION_MODE:     TogglePresentationMode();         break;
 #endif
     case IDC_EXIT:                  Exit();                           break;
 
     // Page-related commands
     case IDC_SAVE_PAGE:             SavePage();                       break;
     case IDC_BOOKMARK_PAGE:         BookmarkCurrentPage();            break;
     case IDC_PIN_TO_START_SCREEN:   PinCurrentPageToStartScreen();    break;
     case IDC_BOOKMARK_ALL_TABS:     BookmarkAllTabs();                break;
     case IDC_VIEW_SOURCE:           ViewSelectedSource();             break;
     case IDC_EMAIL_PAGE_LOCATION:   EmailPageLocation();              break;
@@ skipping 70 matching lines @@
                                         DEVTOOLS_TOGGLE_ACTION_NONE);
                                     break;
     case IDC_DEV_TOOLS_CONSOLE:     ToggleDevToolsWindow(
                                         DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE);
                                     break;
     case IDC_DEV_TOOLS_INSPECT:     ToggleDevToolsWindow(
                                         DEVTOOLS_TOGGLE_ACTION_INSPECT);
                                     break;
     case IDC_TASK_MANAGER:          OpenTaskManager(false);           break;
     case IDC_VIEW_BACKGROUND_PAGES: OpenTaskManager(true);            break;
-    case IDC_FEEDBACK:              OpenFeedbackDialog();            break;
+    case IDC_FEEDBACK:              OpenFeedbackDialog();             break;
 
     case IDC_SHOW_BOOKMARK_BAR:     ToggleBookmarkBar();              break;
     case IDC_PROFILING_ENABLED:     Profiling::Toggle();              break;
 
     case IDC_SHOW_BOOKMARK_MANAGER: OpenBookmarkManager();            break;
     case IDC_SHOW_APP_MENU:         ShowAppMenu();                    break;
     case IDC_SHOW_AVATAR_MENU:      ShowAvatarMenu();                 break;
     case IDC_SHOW_HISTORY:          ShowHistoryTab();                 break;
     case IDC_SHOW_DOWNLOADS:        ShowDownloadsTab();               break;
     case IDC_MANAGE_EXTENSIONS:     ShowExtensionsTab();              break;
     case IDC_OPTIONS:               OpenOptionsDialog();              break;
     case IDC_EDIT_SEARCH_ENGINES:   OpenSearchEngineOptionsDialog();  break;
     case IDC_VIEW_PASSWORDS:        OpenPasswordManager();            break;
     case IDC_CLEAR_BROWSING_DATA:   OpenClearBrowsingDataDialog();    break;
     case IDC_IMPORT_SETTINGS:       OpenImportSettingsDialog();       break;
     case IDC_ABOUT:                 OpenAboutChromeDialog();          break;
     case IDC_UPGRADE_DIALOG:        OpenUpdateChromeDialog();         break;
     case IDC_VIEW_INCOMPATIBILITIES: ShowAboutConflictsTab();         break;
-    case IDC_HELP_PAGE:             ShowHelpTab();                    break;
+    case IDC_HELP_PAGE_VIA_KEYBOARD: ShowHelpTab(HELP_SOURCE_KEYBOARD); break;
+    case IDC_HELP_PAGE_VIA_MENU:    ShowHelpTab(HELP_SOURCE_MENU);    break;
     case IDC_SHOW_SYNC_SETUP:       ShowSyncSetup(SyncPromoUI::SOURCE_MENU);
                                     break;
     case IDC_TOGGLE_SPEECH_INPUT:   ToggleSpeechInput();              break;
 
     default:
       LOG(WARNING) << "Received Unimplemented Command: " << id;
       break;
   }
 }
 
@@ skipping 1494 matching lines @@
   command_updater_.UpdateCommandEnabled(IDC_ZOOM_NORMAL, true);
   command_updater_.UpdateCommandEnabled(IDC_ZOOM_MINUS, true);
 
   // Show various bits of UI
   UpdateOpenFileState();
   command_updater_.UpdateCommandEnabled(IDC_CREATE_SHORTCUTS, false);
   UpdateCommandsForDevTools();
   command_updater_.UpdateCommandEnabled(IDC_TASK_MANAGER, true);
   command_updater_.UpdateCommandEnabled(IDC_SHOW_HISTORY, true);
   command_updater_.UpdateCommandEnabled(IDC_SHOW_DOWNLOADS, true);
-  command_updater_.UpdateCommandEnabled(IDC_HELP_PAGE, true);
+  command_updater_.UpdateCommandEnabled(IDC_HELP_PAGE_VIA_KEYBOARD, true);
+  command_updater_.UpdateCommandEnabled(IDC_HELP_PAGE_VIA_MENU, true);
   command_updater_.UpdateCommandEnabled(IDC_BOOKMARKS_MENU, true);
 
   command_updater_.UpdateCommandEnabled(
       IDC_SHOW_SYNC_SETUP, profile_->GetOriginalProfile()->IsSyncAccessible());
 
   // Initialize other commands based on the window type.
   bool normal_window = is_type_tabbed();
 
   // Navigation commands
   command_updater_.UpdateCommandEnabled(IDC_HOME, normal_window);
@@ skipping 1044 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }