Support Home, Search, Favorites, Refresh, Stop, Back, and Forward keys on an external keyboard.

Supporting these keys would be nice since Stumpy might be used with a keyboard with such keys.

BUG=127209
TEST=manual


Review URL: https://chromiumcodereview.appspot.com/10449064

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139994 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 44 insertions, 7 deletions

diff --git a/ui/base/keycodes/keyboard_code_conversion_x.cc b/ui/base/keycodes/keyboard_code_conversion_x.cc
index 1e32090..6e8af8a 100644
--- a/ui/base/keycodes/keyboard_code_conversion_x.cc
+++ b/ui/base/keycodes/keyboard_code_conversion_x.cc
@@ -331,18 +331,11 @@ KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym) {
       return static_cast<KeyboardCode>(VKEY_F1 + (keysym - XK_F1));
 
 #if defined(TOOLKIT_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
@@ -352,12 +345,34 @@ KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym) {
 #endif
 
     // For supporting multimedia buttons on a USB keyboard.
+    case XF86XK_Back:
+      return VKEY_BROWSER_BACK;
+    case XF86XK_Forward:
+      return VKEY_BROWSER_FORWARD;
+    case XF86XK_Reload:
+      return VKEY_BROWSER_REFRESH;
+    case XF86XK_Stop:
+      return VKEY_BROWSER_STOP;
+    case XF86XK_Search:
+      return VKEY_BROWSER_SEARCH;
+    case XF86XK_Favorites:
+      return VKEY_BROWSER_FAVORITES;
+    case XF86XK_HomePage:
+      return VKEY_BROWSER_HOME;
     case XF86XK_AudioMute:
       return VKEY_VOLUME_MUTE;
     case XF86XK_AudioLowerVolume:
       return VKEY_VOLUME_DOWN;
     case XF86XK_AudioRaiseVolume:
       return VKEY_VOLUME_UP;
+    case XF86XK_AudioStop:
+      return VKEY_MEDIA_STOP;
+    case XF86XK_AudioPlay:
+      return VKEY_MEDIA_PLAY_PAUSE;
+    case XF86XK_Mail:
+      return VKEY_MEDIA_LAUNCH_MAIL;
+    case XF86XK_Calculator:
+      return VKEY_MEDIA_LAUNCH_APP2;
     case XF86XK_MonBrightnessDown:
       return VKEY_BRIGHTNESS_DOWN;
     case XF86XK_MonBrightnessUp:
@@ -674,12 +689,34 @@ int XKeysymForWindowsKeyCode(KeyboardCode keycode, bool shift) {
     case VKEY_F24:
       return XK_F1 + (keycode - VKEY_F1);
 
+    case VKEY_BROWSER_BACK:
+      return XF86XK_Back;
+    case VKEY_BROWSER_FORWARD:
+      return XF86XK_Forward;
+    case VKEY_BROWSER_REFRESH:
+      return XF86XK_Reload;
+    case VKEY_BROWSER_STOP:
+      return XF86XK_Stop;
+    case VKEY_BROWSER_SEARCH:
+      return XF86XK_Search;
+    case VKEY_BROWSER_FAVORITES:
+      return XF86XK_Favorites;
+    case VKEY_BROWSER_HOME:
+      return XF86XK_HomePage;
     case VKEY_VOLUME_MUTE:
       return XF86XK_AudioMute;
     case VKEY_VOLUME_DOWN:
       return XF86XK_AudioLowerVolume;
     case VKEY_VOLUME_UP:
       return XF86XK_AudioRaiseVolume;
+    case VKEY_MEDIA_STOP:
+      return XF86XK_AudioStop;
+    case VKEY_MEDIA_PLAY_PAUSE:
+      return XF86XK_AudioPlay;
+    case VKEY_MEDIA_LAUNCH_MAIL:
+      return XF86XK_Mail;
+    case VKEY_MEDIA_LAUNCH_APP2:
+      return XF86XK_Calculator;
     case VKEY_BRIGHTNESS_DOWN:
       return XF86XK_MonBrightnessDown;
     case VKEY_BRIGHTNESS_UP: