diff options
Diffstat (limited to 'widget')
| -rw-r--r-- | widget/NativeKeyToDOMKeyName.h | 6 | ||||
| -rw-r--r-- | widget/moz.build | 3 |
2 files changed, 1 insertions, 8 deletions
diff --git a/widget/NativeKeyToDOMKeyName.h b/widget/NativeKeyToDOMKeyName.h index e060a313c..c00cdb2b6 100644 --- a/widget/NativeKeyToDOMKeyName.h +++ b/widget/NativeKeyToDOMKeyName.h @@ -80,15 +80,9 @@ #undef KEY_MAP_ANDROID #define KEY_MAP_ANDROID(aCPPKeyName, aNativeKey) \ NS_NATIVE_KEY_TO_DOM_KEY_NAME_INDEX(aNativeKey, KEY_NAME_INDEX_##aCPPKeyName) -#ifndef MOZ_B2G #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) -#else // #ifndef MOZ_B2G -#undef KEY_MAP_B2G -#define KEY_MAP_B2G(aCPPKeyName, aNativeKey) \ - NS_NATIVE_KEY_TO_DOM_KEY_NAME_INDEX(aNativeKey, KEY_NAME_INDEX_##aCPPKeyName) -#endif // #ifndef MOZ_B2G #else #endif /****************************************************************************** diff --git a/widget/moz.build b/widget/moz.build index 5138a89ef..b156346eb 100644 --- a/widget/moz.build +++ b/widget/moz.build @@ -236,8 +236,7 @@ if toolkit == 'gtk3': 'nsIApplicationChooser.idl', ] -if not CONFIG['MOZ_B2G']: - DEFINES['MOZ_CROSS_PROCESS_IME'] = True +DEFINES['MOZ_CROSS_PROCESS_IME'] = True include('/ipc/chromium/chromium-config.mozbuild') |