summaryrefslogtreecommitdiffstats
path: root/chrome/browser/app_controller_mac.mm
diff options
context:
space:
mode:
authorderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-12 03:49:48 +0000
committerderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-12 03:49:48 +0000
commit2ca3561eb2d3ba8d6cf326d3f393aa56accf2af4 (patch)
tree748301e2725842c211d5645cfb375af029970baa /chrome/browser/app_controller_mac.mm
parentbc4506a4acf926b41ee87d3a4128d95e2c1badd7 (diff)
downloadchromium_src-2ca3561eb2d3ba8d6cf326d3f393aa56accf2af4.zip
chromium_src-2ca3561eb2d3ba8d6cf326d3f393aa56accf2af4.tar.gz
chromium_src-2ca3561eb2d3ba8d6cf326d3f393aa56accf2af4.tar.bz2
Use different help URLs for menus, accelerators, and WebUI.
This adds a "ctx" parameter to help center URLs. Its value varies dependending on the manner in which help was requested. BUG=128611 TEST=manual: opened help using various methods in Linux and Chrome OS builds and checked that correct URLs were opened (the about page button doesn't work for me, but it's also broken when I do a build using clean source) Review URL: https://chromiumcodereview.appspot.com/10546072 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141609 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/app_controller_mac.mm')
-rw-r--r--chrome/browser/app_controller_mac.mm8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 0841136..99b2325 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -891,11 +891,11 @@ const AEEventClass kAECloudPrintUninstallClass = 'GCPu';
else
Browser::OpenExtensionsWindow(lastProfile);
break;
- case IDC_HELP_PAGE:
+ case IDC_HELP_PAGE_VIA_MENU:
if (Browser* browser = ActivateBrowser(lastProfile))
- browser->ShowHelpTab();
+ browser->ShowHelpTab(Browser::HELP_SOURCE_MENU);
else
- Browser::OpenHelpWindow(lastProfile);
+ Browser::OpenHelpWindow(lastProfile, Browser::HELP_SOURCE_MENU);
break;
case IDC_SHOW_SYNC_SETUP:
if (Browser* browser = ActivateBrowser(lastProfile))
@@ -1024,7 +1024,7 @@ const AEEventClass kAECloudPrintUninstallClass = 'GCPu';
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);
menuState_->UpdateCommandEnabled(IDC_IMPORT_SETTINGS, true);
menuState_->UpdateCommandEnabled(IDC_FEEDBACK, true);
menuState_->UpdateCommandEnabled(IDC_SHOW_SYNC_SETUP, true);