Bug 895274 part.226 Rename NS_DEVICE_PROXIMITY to eDeviceProximity r=smaug

This commit is contained in:
Masayuki Nakano 2015-09-12 01:19:28 +09:00
parent 58becb4914
commit 6723616018
3 changed files with 6 additions and 6 deletions

View File

@ -320,7 +320,7 @@ EventListenerManager::AddEventListenerInternal(
} else if (aTypeAtom == nsGkAtoms::ondeviceorientation) {
EnableDevice(eDeviceOrientation);
} else if (aTypeAtom == nsGkAtoms::ondeviceproximity || aTypeAtom == nsGkAtoms::onuserproximity) {
EnableDevice(NS_DEVICE_PROXIMITY);
EnableDevice(eDeviceProximity);
} else if (aTypeAtom == nsGkAtoms::ondevicelight) {
EnableDevice(NS_DEVICE_LIGHT);
} else if (aTypeAtom == nsGkAtoms::ondevicemotion) {
@ -422,7 +422,7 @@ EventListenerManager::IsDeviceType(EventMessage aEventMessage)
case eDeviceOrientation:
case eDeviceMotion:
case NS_DEVICE_LIGHT:
case NS_DEVICE_PROXIMITY:
case eDeviceProximity:
case NS_USER_PROXIMITY:
return true;
default:
@ -443,7 +443,7 @@ EventListenerManager::EnableDevice(EventMessage aEventMessage)
case eDeviceOrientation:
window->EnableDeviceSensor(SENSOR_ORIENTATION);
break;
case NS_DEVICE_PROXIMITY:
case eDeviceProximity:
case NS_USER_PROXIMITY:
window->EnableDeviceSensor(SENSOR_PROXIMITY);
break;
@ -478,7 +478,7 @@ EventListenerManager::DisableDevice(EventMessage aEventMessage)
window->DisableDeviceSensor(SENSOR_LINEAR_ACCELERATION);
window->DisableDeviceSensor(SENSOR_GYROSCOPE);
break;
case NS_DEVICE_PROXIMITY:
case eDeviceProximity:
case NS_USER_PROXIMITY:
window->DisableDeviceSensor(SENSOR_PROXIMITY);
break;

View File

@ -536,7 +536,7 @@ WINDOW_ONLY_EVENT(deviceorientation,
EventNameType_None,
eBasicEventClass)
WINDOW_ONLY_EVENT(deviceproximity,
NS_DEVICE_PROXIMITY,
eDeviceProximity,
EventNameType_None,
eBasicEventClass)
WINDOW_ONLY_EVENT(userproximity,

View File

@ -358,7 +358,7 @@ NS_EVENT_MESSAGE(eOpen, eOpenCloseEventFirst)
NS_EVENT_MESSAGE(eDeviceEventFirst, 4900)
NS_EVENT_MESSAGE(eDeviceOrientation, eDeviceEventFirst)
NS_EVENT_MESSAGE(eDeviceMotion, eDeviceEventFirst + 1)
NS_EVENT_MESSAGE(NS_DEVICE_PROXIMITY, eDeviceEventFirst + 2)
NS_EVENT_MESSAGE(eDeviceProximity, eDeviceEventFirst + 2)
NS_EVENT_MESSAGE(NS_USER_PROXIMITY, eDeviceEventFirst + 3)
NS_EVENT_MESSAGE(NS_DEVICE_LIGHT, eDeviceEventFirst + 4)