diff options
| -rw-r--r-- | chrome/browser/browser.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/views/accelerator_table_gtk.cc | 6 | ||||
| -rw-r--r-- | views/accelerator.cc | 10 |
3 files changed, 19 insertions, 2 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 }, diff --git a/views/accelerator.cc b/views/accelerator.cc index 6b80cc4..6eeddb5 100644 --- a/views/accelerator.cc +++ b/views/accelerator.cc @@ -84,7 +84,15 @@ std::wstring Accelerator::GetShortcutText() const { key = LOWORD(::MapVirtualKeyW(key_code_, MAPVK_VK_TO_CHAR)); shortcut += key; #elif defined(OS_LINUX) - gchar* name = gdk_keyval_name(gdk_keyval_to_lower(key_code_)); + const gchar* name = NULL; + switch (key_code_) { + case app::VKEY_OEM_2: + name = static_cast<const gchar*>("/"); + break; + default: + name = gdk_keyval_name(gdk_keyval_to_lower(key_code_)); + break; + } if (name) { if (name[0] != 0 && name[1] == 0) shortcut += static_cast<wchar_t>(g_ascii_toupper(name[0])); |