diff options
Diffstat (limited to 'widget')
| -rw-r--r-- | widget/EventMessageList.h | 2 | ||||
| -rw-r--r-- | widget/PuppetWidget.cpp | 5 | ||||
| -rw-r--r-- | widget/nsContentProcessWidgetFactory.cpp | 3 | ||||
| -rw-r--r-- | widget/tests/TestAppShellSteadyState.cpp | 2 |
4 files changed, 2 insertions, 10 deletions
diff --git a/widget/EventMessageList.h b/widget/EventMessageList.h index 2eed7e618..372ca90fb 100644 --- a/widget/EventMessageList.h +++ b/widget/EventMessageList.h @@ -379,7 +379,7 @@ NS_EVENT_MESSAGE(eDeviceMotion) NS_EVENT_MESSAGE(eDeviceProximity) NS_EVENT_MESSAGE(eUserProximity) NS_EVENT_MESSAGE(eDeviceLight) -#if defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GONK) +#if defined(MOZ_WIDGET_ANDROID) NS_EVENT_MESSAGE(eOrientationChange) #endif diff --git a/widget/PuppetWidget.cpp b/widget/PuppetWidget.cpp index 1fa13ee6f..657f70551 100644 --- a/widget/PuppetWidget.cpp +++ b/widget/PuppetWidget.cpp @@ -541,10 +541,6 @@ PuppetWidget::ExecuteNativeKeyBinding(NativeKeyBindingsType aType, DoCommandCallback aCallback, void* aCallbackData) { - // B2G doesn't have native key bindings. -#ifdef MOZ_WIDGET_GONK - return false; -#else // #ifdef MOZ_WIDGET_GONK AutoCacheNativeKeyCommands autoCache(this); if (!aEvent.mWidget && !mNativeKeyCommandsValid) { MOZ_ASSERT(!aEvent.mFlags.mIsSynthesizedForTests); @@ -581,7 +577,6 @@ PuppetWidget::ExecuteNativeKeyBinding(NativeKeyBindingsType aType, aCallback(static_cast<mozilla::Command>((*commands)[i]), aCallbackData); } return true; -#endif } LayerManager* diff --git a/widget/nsContentProcessWidgetFactory.cpp b/widget/nsContentProcessWidgetFactory.cpp index 2f00f1c83..7430721f2 100644 --- a/widget/nsContentProcessWidgetFactory.cpp +++ b/widget/nsContentProcessWidgetFactory.cpp @@ -17,8 +17,6 @@ using namespace mozilla; using namespace mozilla::widget; -#ifndef MOZ_WIDGET_GONK - NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboardProxy) NS_GENERIC_FACTORY_CONSTRUCTOR(nsColorPickerProxy) NS_GENERIC_FACTORY_CONSTRUCTOR(nsDragServiceProxy) @@ -68,4 +66,3 @@ static const mozilla::Module kWidgetModule = { NSMODULE_DEFN(nsContentProcessWidgetModule) = &kWidgetModule; -#endif /* MOZ_WIDGET_GONK */ diff --git a/widget/tests/TestAppShellSteadyState.cpp b/widget/tests/TestAppShellSteadyState.cpp index 03888fc0a..162343e38 100644 --- a/widget/tests/TestAppShellSteadyState.cpp +++ b/widget/tests/TestAppShellSteadyState.cpp @@ -310,7 +310,7 @@ already_AddRefed<nsIAppShell> GetAppShell() { static const char* platforms[] = { - "android", "mac", "gonk", "gtk", "qt", "win" + "android", "mac", "gtk", "qt", "win" }; NS_NAMED_LITERAL_CSTRING(contractPrefix, "@mozilla.org/widget/appshell/"); |