diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 22:02:05 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 22:02:05 +0000 |
| commit | 591a792d1a074fefdb9321f547b9209ebfc9e85a (patch) | |
| tree | 3304bb54333c2ca31a799553a239a82d9dc3d2da /chrome | |
| parent | d7d6ad4cece22e87bcdabc8b2eb9abe6fd71fcca (diff) | |
| download | chromium_src-591a792d1a074fefdb9321f547b9209ebfc9e85a.zip chromium_src-591a792d1a074fefdb9321f547b9209ebfc9e85a.tar.gz chromium_src-591a792d1a074fefdb9321f547b9209ebfc9e85a.tar.bz2 | |
chromeos: Add Ctrl-/ accelerator for help app.
This adds Ctrl-/ and Ctrl-Shift-/ (Ctrl-?) accelerators for
the help command in Views GTK, updates the help URL for
Chrome OS, and makes us print "/" explicitly in accelerator
descriptions instead of "slash" (the string we get from GDK).
BUG=chromium-os:7835
TEST=built and ran it
Review URL: http://codereview.chromium.org/4156004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64495 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/browser.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/views/accelerator_table_gtk.cc | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 053c4f2..12d2338 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -141,8 +141,13 @@ using base::TimeDelta; static const int kUIUpdateCoalescingTimeMS = 200; // The URL to be loaded to display Help. +#if defined(OS_CHROMEOS) +static const char* const kHelpContentUrl = + "chrome-extension://nifaohjgppdbmalmmgkmfdlodaggnbpe/main.html"; +#else static const char* const kHelpContentUrl = "http://www.google.com/support/chrome/"; +#endif // The URL to be loaded to display the "Report a broken page" form. static const std::string kBrokenPageUrl = diff --git a/chrome/browser/views/accelerator_table_gtk.cc b/chrome/browser/views/accelerator_table_gtk.cc index 3baa65e..5cea792 100644 --- a/chrome/browser/views/accelerator_table_gtk.cc +++ b/chrome/browser/views/accelerator_table_gtk.cc @@ -13,7 +13,7 @@ namespace browser { // NOTE: Keep this list in the same (mostly-alphabetical) order as // the Windows accelerators in ../../app/chrome_dll.rc. const AcceleratorMapping kAcceleratorMap[] = { - // Keycode Shift Ctrl Alt Command ID + // Keycode Shift Ctrl Alt Command ID { app::VKEY_A, true, true, false, IDC_AUTOFILL_DEFAULT }, { app::VKEY_LEFT, false, false, true, IDC_BACK }, { app::VKEY_BACK, false, false, false, IDC_BACK }, @@ -81,6 +81,10 @@ const AcceleratorMapping kAcceleratorMap[] = { #if !defined(OS_CHROMEOS) { app::VKEY_F1, false, false, false, IDC_HELP_PAGE }, #endif +#if defined(OS_CHROMEOS) + { app::VKEY_OEM_2, false, true, false, IDC_HELP_PAGE }, + { app::VKEY_OEM_2, true, true, false, IDC_HELP_PAGE }, +#endif { app::VKEY_I, true, true, false, IDC_DEV_TOOLS }, { app::VKEY_J, true, true, false, IDC_DEV_TOOLS_CONSOLE }, { app::VKEY_C, true, true, false, IDC_DEV_TOOLS_INSPECT }, |