Bug 895274 part.227 Rename NS_USER_PROXIMITY to eUserProximity r=smaug

dom/events/EventListenerManager.cpp

@@ -423,7 +423,7 @@ EventListenerManager::IsDeviceType(EventMessage aEventMessage)
     case eDeviceMotion:
     case NS_DEVICE_LIGHT:
     case eDeviceProximity:
-    case NS_USER_PROXIMITY:
+    case eUserProximity:
       return true;
     default:
       break;
@@ -444,7 +444,7 @@ EventListenerManager::EnableDevice(EventMessage aEventMessage)
       window->EnableDeviceSensor(SENSOR_ORIENTATION);
       break;
     case eDeviceProximity:
-    case NS_USER_PROXIMITY:
+    case eUserProximity:
       window->EnableDeviceSensor(SENSOR_PROXIMITY);
       break;
     case NS_DEVICE_LIGHT:
@@ -479,7 +479,7 @@ EventListenerManager::DisableDevice(EventMessage aEventMessage)
       window->DisableDeviceSensor(SENSOR_GYROSCOPE);
       break;
     case eDeviceProximity:
-    case NS_USER_PROXIMITY:
+    case eUserProximity:
       window->DisableDeviceSensor(SENSOR_PROXIMITY);
       break;
     case NS_DEVICE_LIGHT:

dom/events/EventNameList.h

@@ -540,7 +540,7 @@ WINDOW_ONLY_EVENT(deviceproximity,
                   EventNameType_None,
                   eBasicEventClass)
 WINDOW_ONLY_EVENT(userproximity,
-                  NS_USER_PROXIMITY,
+                  eUserProximity,
                   EventNameType_None,
                   eBasicEventClass)
 WINDOW_ONLY_EVENT(devicelight,

widget/EventMessageList.h

@@ -359,7 +359,7 @@ NS_EVENT_MESSAGE(eDeviceEventFirst,      4900)
 NS_EVENT_MESSAGE(eDeviceOrientation,     eDeviceEventFirst)
 NS_EVENT_MESSAGE(eDeviceMotion,          eDeviceEventFirst + 1)
 NS_EVENT_MESSAGE(eDeviceProximity,       eDeviceEventFirst + 2)
-NS_EVENT_MESSAGE(NS_USER_PROXIMITY,      eDeviceEventFirst + 3)
+NS_EVENT_MESSAGE(eUserProximity,         eDeviceEventFirst + 3)
 NS_EVENT_MESSAGE(NS_DEVICE_LIGHT,        eDeviceEventFirst + 4)
 
 NS_EVENT_MESSAGE(NS_SHOW_EVENT,          5000)