Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(182)

Unified Diff: chrome/browser/app_controller_mac.mm

Issue 10546072: Use different help URLs for menus, accelerators, and WebUI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac compile Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/chrome_dll.rc ('k') | chrome/browser/chromeos/system/ash_system_tray_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/app_controller_mac.mm
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 084113688bb2dcd0271b73d44170c9a9a659e676..fb9f88dfb8294cad9f9d2eb701ec86deee44e827 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -891,12 +891,17 @@ const AEEventClass kAECloudPrintUninstallClass = 'GCPu';
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);
@@ -1024,7 +1029,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);
Daniel Erat 2012/06/08 21:07:11 Should I also be calling this for IDC_HELP_PAGE_VI
Avi (use Gerrit) 2012/06/11 20:54:06 There's no "help" keyboard shortcut on the Mac; I
Daniel Erat 2012/06/11 21:05:37 Thanks, that answers it. I've removed IDC_HELP_PA
menuState_->UpdateCommandEnabled(IDC_IMPORT_SETTINGS, true);
menuState_->UpdateCommandEnabled(IDC_FEEDBACK, true);
menuState_->UpdateCommandEnabled(IDC_SHOW_SYNC_SETUP, true);
« no previous file with comments | « chrome/app/chrome_dll.rc ('k') | chrome/browser/chromeos/system/ash_system_tray_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698