From ea3ceb80a175867b5522f0c34e604aaca9447e4c Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Fri, 4 Sep 2015 19:54:11 +0900
Subject: [PATCH] Bug 895274 part.90 Rename NS_XUL_POPUP_HIDDEN to
 eXULPopupHidden r=smaug

---
 dom/events/EventNameList.h       | 2 +-
 layout/xul/nsXULPopupManager.cpp | 2 +-
 widget/EventMessageList.h        | 2 +-
 widget/cocoa/nsMenuX.mm          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dom/events/EventNameList.h b/dom/events/EventNameList.h
index 16949269935..c1967b4f17a 100644
--- a/dom/events/EventNameList.h
+++ b/dom/events/EventNameList.h
@@ -708,7 +708,7 @@ NON_IDL_EVENT(popuphiding,
               EventNameType_XUL,
               eBasicEventClass)
 NON_IDL_EVENT(popuphidden,
-              NS_XUL_POPUP_HIDDEN,
+              eXULPopupHidden,
               EventNameType_XUL,
               eBasicEventClass)
 NON_IDL_EVENT(broadcast,
diff --git a/layout/xul/nsXULPopupManager.cpp b/layout/xul/nsXULPopupManager.cpp
index fa18060862f..04e7d62f002 100644
--- a/layout/xul/nsXULPopupManager.cpp
+++ b/layout/xul/nsXULPopupManager.cpp
@@ -1118,7 +1118,7 @@ nsXULPopupManager::HidePopupCallback(nsIContent* aPopup,
   // send the popuphidden event synchronously. This event has no default
   // behaviour.
   nsEventStatus status = nsEventStatus_eIgnore;
-  WidgetMouseEvent event(true, NS_XUL_POPUP_HIDDEN, nullptr,
+  WidgetMouseEvent event(true, eXULPopupHidden, nullptr,
                          WidgetMouseEvent::eReal);
   EventDispatcher::Dispatch(aPopup, aPopupFrame->PresContext(),
                             &event, nullptr, &status);
diff --git a/widget/EventMessageList.h b/widget/EventMessageList.h
index 95e23afdb3c..affcedccc0a 100644
--- a/widget/EventMessageList.h
+++ b/widget/EventMessageList.h
@@ -119,7 +119,7 @@ NS_EVENT_MESSAGE(eXULEventFirst,        1500)
 NS_EVENT_MESSAGE(eXULPopupShowing,      eXULEventFirst)
 NS_EVENT_MESSAGE(eXULPopupShown,        eXULEventFirst + 1)
 NS_EVENT_MESSAGE(eXULPopupHiding,       eXULEventFirst + 2)
-NS_EVENT_MESSAGE(NS_XUL_POPUP_HIDDEN,   eXULEventFirst + 3)
+NS_EVENT_MESSAGE(eXULPopupHidden,       eXULEventFirst + 3)
 NS_EVENT_MESSAGE(NS_XUL_BROADCAST,      eXULEventFirst + 5)
 NS_EVENT_MESSAGE(NS_XUL_COMMAND_UPDATE, eXULEventFirst + 6)
 
diff --git a/widget/cocoa/nsMenuX.mm b/widget/cocoa/nsMenuX.mm
index dd0eedc9511..de9c01880f7 100644
--- a/widget/cocoa/nsMenuX.mm
+++ b/widget/cocoa/nsMenuX.mm
@@ -379,7 +379,7 @@ void nsMenuX::MenuClosed()
     mContent->UnsetAttr(kNameSpaceID_None, nsGkAtoms::open, true);
 
     nsEventStatus status = nsEventStatus_eIgnore;
-    WidgetMouseEvent event(true, NS_XUL_POPUP_HIDDEN, nullptr,
+    WidgetMouseEvent event(true, eXULPopupHidden, nullptr,
                            WidgetMouseEvent::eReal);
 
     nsCOMPtr<nsIContent> popupContent;