Bug 939006 part.10 Sort out key names in Application Keys section r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Wed, 04 Jun 2014 21:43:44 +0900
changeset 206917 1d8d1aa2d7e0123c948be7f738642db872584b26
parent 206916 d8a5caee34634eaa117c992a24cb364ae9549adf
child 206918 7751a79c21bf29b5094420b11a0262d6f349989d
push id494
push userraliiev@mozilla.com
push dateMon, 25 Aug 2014 18:42:16 +0000
treeherdermozilla-release@a3cc3e46b571 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs939006
milestone32.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 939006 part.10 Sort out key names in Application Keys section r=smaug
dom/events/KeyNameList.h
widget/shared/NativeKeyToDOMKeyName.h
--- a/dom/events/KeyNameList.h
+++ b/dom/events/KeyNameList.h
@@ -219,17 +219,31 @@ DEFINE_KEYNAME_WITH_SAME_NAME(MediaPrevi
 // DEFINE_KEYNAME_WITH_SAME_NAME(Open)
 // DEFINE_KEYNAME_WITH_SAME_NAME(Print)
 // DEFINE_KEYNAME_WITH_SAME_NAME(Save)
 // DEFINE_KEYNAME_WITH_SAME_NAME(SpellCheck)
 DEFINE_KEYNAME_WITH_SAME_NAME(VolumeDown)
 DEFINE_KEYNAME_WITH_SAME_NAME(VolumeUp)
 DEFINE_KEYNAME_WITH_SAME_NAME(VolumeMute)
 
-DEFINE_KEYNAME_WITH_SAME_NAME(Apps)
+/******************************************************************************
+ * Application Keys
+ *****************************************************************************/
+// DEFINE_KEYNAME_WITH_SAME_NAME(LaunchCalculator)
+// DEFINE_KEYNAME_WITH_SAME_NAME(LaunchCalendar)
+DEFINE_KEYNAME_WITH_SAME_NAME(LaunchMail)
+// DEFINE_KEYNAME_WITH_SAME_NAME(LaunchMediaPlayer)
+// DEFINE_KEYNAME_WITH_SAME_NAME(LaunchMusicPlayer)
+// DEFINE_KEYNAME_WITH_SAME_NAME(LaunchMyComputer)
+// DEFINE_KEYNAME_WITH_SAME_NAME(LaunchScreenSaver)
+// DEFINE_KEYNAME_WITH_SAME_NAME(LaunchSpreadsheet)
+// DEFINE_KEYNAME_WITH_SAME_NAME(LaunchWebBrowser)
+// DEFINE_KEYNAME_WITH_SAME_NAME(LaunchWebCam)
+// DEFINE_KEYNAME_WITH_SAME_NAME(LaunchWordProcessor)
+
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication1)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication2)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication3)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication4)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication5)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication6)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication7)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication8)
@@ -238,17 +252,18 @@ DEFINE_KEYNAME_WITH_SAME_NAME(LaunchAppl
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication11)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication12)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication13)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication14)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication15)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication16)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication17)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication18)
-DEFINE_KEYNAME_WITH_SAME_NAME(LaunchMail)
+
+DEFINE_KEYNAME_WITH_SAME_NAME(Apps)
 DEFINE_KEYNAME_WITH_SAME_NAME(List)
 DEFINE_KEYNAME_WITH_SAME_NAME(Info)
 DEFINE_KEYNAME_WITH_SAME_NAME(Exit)
 DEFINE_KEYNAME_WITH_SAME_NAME(Zoom)
 DEFINE_KEYNAME_WITH_SAME_NAME(BrowserFavorites)
 DEFINE_KEYNAME_WITH_SAME_NAME(BrowserHome)
 DEFINE_KEYNAME_WITH_SAME_NAME(BrowserRefresh)
 DEFINE_KEYNAME_WITH_SAME_NAME(BrowserSearch)
--- a/widget/shared/NativeKeyToDOMKeyName.h
+++ b/widget/shared/NativeKeyToDOMKeyName.h
@@ -771,19 +771,24 @@ KEY_MAP_ANDROID (VolumeUp, AKEYCODE_VOLU
 
 // VolumeMute
 KEY_MAP_WIN     (VolumeMute, VK_VOLUME_MUTE)
 KEY_MAP_COCOA   (VolumeMute, kVK_Mute)
 KEY_MAP_GTK     (VolumeMute, GDK_AudioMute)
 KEY_MAP_QT      (VolumeMute, Qt::Key_VolumeMute)
 KEY_MAP_ANDROID (VolumeMute, AKEYCODE_VOLUME_MUTE)
 
-
-// Apps
-KEY_MAP_ANDROID (Apps, AKEYCODE_APP_SWITCH)
+/******************************************************************************
+ * Application Keys
+ ******************************************************************************/
+// LaunchMail
+KEY_MAP_WIN     (LaunchMail, VK_LAUNCH_MAIL)
+KEY_MAP_GTK     (LaunchMail, GDK_Mail)
+KEY_MAP_QT      (LaunchMail, Qt::Key_LaunchMail)
+KEY_MAP_ANDROID (LaunchMail, AKEYCODE_ENVELOPE)
 
 // LaunchApplication1
 KEY_MAP_WIN     (LaunchApplication1, VK_LAUNCH_APP1)
 KEY_MAP_GTK     (LaunchApplication1, GDK_Launch0)
 KEY_MAP_QT      (LaunchApplication1, Qt::Key_Launch0)
 KEY_MAP_ANDROID (LaunchApplication1, AKEYCODE_EXPLORER)
 
 // LaunchApplication2
@@ -848,21 +853,19 @@ KEY_MAP_GTK     (LaunchApplication16, GD
 KEY_MAP_QT      (LaunchApplication16, Qt::Key_LaunchF)
 
 // LaunchApplication17
 KEY_MAP_QT      (LaunchApplication17, Qt::Key_LaunchG)
 
 // LaunchApplication18
 KEY_MAP_QT      (LaunchApplication18, Qt::Key_LaunchH)
 
-// LaunchMail
-KEY_MAP_WIN     (LaunchMail, VK_LAUNCH_MAIL)
-KEY_MAP_GTK     (LaunchMail, GDK_Mail)
-KEY_MAP_QT      (LaunchMail, Qt::Key_LaunchMail)
-KEY_MAP_ANDROID (LaunchMail, AKEYCODE_ENVELOPE)
+
+// Apps
+KEY_MAP_ANDROID (Apps, AKEYCODE_APP_SWITCH)
 
 // List
 
 // Info
 KEY_MAP_ANDROID (Info, AKEYCODE_INFO)
 
 // Exit
 KEY_MAP_ANDROID (Exit, AKEYCODE_HOME)