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 /views/accelerator.cc | |
| 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 'views/accelerator.cc')
| -rw-r--r-- | views/accelerator.cc | 10 |
1 files changed, 9 insertions, 1 deletions
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])); |