Bug 1446809 - Remove some b2g leftover in widget/NativeKeyToDOMKeyName.h r?froydnj
MozReview-Commit-ID: 7nRuHThygp1
--- a/widget/NativeKeyToDOMKeyName.h
+++ b/widget/NativeKeyToDOMKeyName.h
@@ -20,22 +20,18 @@
#define KEY_MAP_WIN_JPN(aCPPKeyName, aNativeKey)
#define KEY_MAP_WIN_KOR(aCPPKeyName, aNativeKey)
#define KEY_MAP_WIN_OTH(aCPPKeyName, aNativeKey)
#define KEY_MAP_WIN_CMD(aCPPKeyName, aAppCommand)
// Mac OS X
#define KEY_MAP_COCOA(aCPPKeyName, aNativeKey)
// GTK
#define KEY_MAP_GTK(aCPPKeyName, aNativeKey)
-// Android and B2G
+// Only for Android
#define KEY_MAP_ANDROID(aCPPKeyName, aNativeKey)
-// Only for Android
-#define KEY_MAP_ANDROID_EXCEPT_B2G(aCPPKeyName, aNativeKey)
-// Only for B2G
-#define KEY_MAP_B2G(aCPPKeyName, aNativeKey)
#if defined(XP_WIN)
#if defined(NS_NATIVE_KEY_TO_DOM_KEY_NAME_INDEX)
// KEY_MAP_WIN() defines the mapping not depending on keyboard layout.
#undef KEY_MAP_WIN
#define KEY_MAP_WIN(aCPPKeyName, aNativeKey) \
NS_NATIVE_KEY_TO_DOM_KEY_NAME_INDEX(aNativeKey, KEY_NAME_INDEX_##aCPPKeyName)
#elif defined(NS_JAPANESE_NATIVE_KEY_TO_DOM_KEY_NAME_INDEX)
@@ -75,19 +71,16 @@
#elif defined(MOZ_WIDGET_GTK)
#undef KEY_MAP_GTK
#define KEY_MAP_GTK(aCPPKeyName, aNativeKey) \
NS_NATIVE_KEY_TO_DOM_KEY_NAME_INDEX(aNativeKey, KEY_NAME_INDEX_##aCPPKeyName)
#elif defined(ANDROID)
#undef KEY_MAP_ANDROID
#define KEY_MAP_ANDROID(aCPPKeyName, aNativeKey) \
NS_NATIVE_KEY_TO_DOM_KEY_NAME_INDEX(aNativeKey, KEY_NAME_INDEX_##aCPPKeyName)
-#undef KEY_MAP_ANDROID_EXCEPT_B2G
-#define KEY_MAP_ANDROID_EXCEPT_B2G(aCPPKeyName, aNativeKey) \
- NS_NATIVE_KEY_TO_DOM_KEY_NAME_INDEX(aNativeKey, KEY_NAME_INDEX_##aCPPKeyName)
#endif
/******************************************************************************
* Modifier Keys
******************************************************************************/
// Alt
KEY_MAP_WIN (Alt, VK_MENU)
KEY_MAP_WIN (Alt, VK_LMENU)
@@ -1051,27 +1044,26 @@ KEY_MAP_ANDROID (AppSwitch, AKEYCODE_APP
// Call
KEY_MAP_ANDROID (Call, AKEYCODE_CALL)
// Camera
KEY_MAP_ANDROID (Camera, AKEYCODE_CAMERA)
// CameraFocus
-KEY_MAP_ANDROID_EXCEPT_B2G(CameraFocus, AKEYCODE_FOCUS)
+KEY_MAP_ANDROID(CameraFocus, AKEYCODE_FOCUS)
// EndCall
KEY_MAP_ANDROID (EndCall, AKEYCODE_ENDCALL)
// GoBack
KEY_MAP_ANDROID (GoBack, AKEYCODE_BACK)
// GoHome
-KEY_MAP_ANDROID_EXCEPT_B2G(GoHome, AKEYCODE_HOME)
-KEY_MAP_B2G (HomeScreen, AKEYCODE_HOME)
+KEY_MAP_ANDROID(GoHome, AKEYCODE_HOME)
// HeadsetHook
KEY_MAP_ANDROID (HeadsetHook, AKEYCODE_HEADSETHOOK)
// Notification
KEY_MAP_ANDROID (Notification, AKEYCODE_NOTIFICATION)
// MannerMode
@@ -1283,10 +1275,8 @@ KEY_MAP_ANDROID (SoftRight, AKEYCODE_SOF
#undef KEY_MAP_WIN
#undef KEY_MAP_WIN_JPN
#undef KEY_MAP_WIN_KOR
#undef KEY_MAP_WIN_OTH
#undef KEY_MAP_WIN_CMD
#undef KEY_MAP_COCOA
#undef KEY_MAP_GTK
#undef KEY_MAP_ANDROID
-#undef KEY_MAP_ANDROID_EXCEPT_B2G
-#undef KEY_MAP_B2G