diff options
| author | yusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-13 05:30:45 +0000 |
|---|---|---|
| committer | yusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-13 05:30:45 +0000 |
| commit | 6e5a3f1381da7014c9d4a3fca5b1f820eb83e521 (patch) | |
| tree | 53f5e66bd614b94ba56de4fb5cf4c9c4a25fce77 /ui | |
| parent | b25b3ee65454e190be9c17cf3a08abf5ef44619b (diff) | |
| download | chromium_src-6e5a3f1381da7014c9d4a3fca5b1f820eb83e521.zip chromium_src-6e5a3f1381da7014c9d4a3fca5b1f820eb83e521.tar.gz chromium_src-6e5a3f1381da7014c9d4a3fca5b1f820eb83e521.tar.bz2 | |
Remove false warnings on startup.
BUG=109843
TEST=build Chrome for Linux, start Chrome, confirm no keysym warning is shown.
Review URL: http://codereview.chromium.org/9185004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117614 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/keycodes/keyboard_code_conversion_x.cc | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/ui/base/keycodes/keyboard_code_conversion_x.cc b/ui/base/keycodes/keyboard_code_conversion_x.cc index 00a4e1b..ee6fe9e 100644 --- a/ui/base/keycodes/keyboard_code_conversion_x.cc +++ b/ui/base/keycodes/keyboard_code_conversion_x.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,6 +8,7 @@ #include <X11/keysym.h> #include <X11/Xlib.h> #include <X11/Xutil.h> +#include <X11/XF86keysym.h> #include "base/basictypes.h" #include "base/logging.h" @@ -322,6 +323,27 @@ KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym) { case XK_F24: return static_cast<KeyboardCode>(VKEY_F1 + (keysym - XK_F1)); +#if defined(TOOLKIT_USES_GTK) + case XF86XK_HomePage: + case XF86XK_Search: + case XF86XK_Back: + case XF86XK_Forward: + case XF86XK_Stop: + case XF86XK_Refresh: + case XF86XK_Favorites: + case XF86XK_History: + case XF86XK_OpenURL: + case XF86XK_AddFavorite: + case XF86XK_Go: + case XF86XK_Reload: + case XF86XK_ZoomIn: + case XF86XK_ZoomOut: + // ui::AcceleratorGtk tries to convert the XF86XK_ keysyms on Chrome + // startup. It's safe to return VKEY_UNKNOWN here since ui::AcceleratorGtk + // also checks a Gdk keysym. http://crbug.com/109843 + return VKEY_UNKNOWN; +#endif + // TODO(sad): some keycodes are still missing. } DLOG(WARNING) << "Unknown keysym: " << StringPrintf("0x%x", keysym); |