Changed IIDs to be unique

xpfe/AppCores/public/nsAppCoresCIDs.h

@@ -2,27 +2,23 @@
 #define nsAppCoresCIDs_h___
 
 #define NS_AppCores_CID                        \
-{ /* 18c2f982-b09f-11d2-bcde-00805f0e1353 */         \
-    0x18c2f982, 0xb09f, 0x11d2,                      \
-    {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53} \
+{ /* B2A68893-BFA2-11d2-96C8-0060B0FB9956 */         \
+    0xb2a68893, 0xbfa2, 0x11d2, { 0x96, 0xc8, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56 } \
 }
 
 #define NS_AppCoresFactory_CID                 \
-{ /* 18c2f984-b09f-11d2-bcde-00805f0e1353 */         \
-    0x18c2f984, 0xb09f, 0x11d2,                      \
-    {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53} \
+{ /* B2A68894-BFA2-11d2-96C8-0060B0FB9956 */         \
+    0xb2a68894, 0xbfa2, 0x11d2, { 0x96, 0xc8, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56} \
 }
 
 #define NS_MailCore_CID                    \
-{ /* 18c2f983-b09f-11d2-bcde-00805f0e1353 */         \
-    0x18c2f983, 0xb09f, 0x11d2,                      \
-    {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53} \
+{ /* B2A68895-BFA2-11d2-96C8-0060B0FB9956 */         \
+    0xb2a68895, 0xbfa2, 0x11d2, { 0x96, 0xc8, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56} \
 }
 
 #define NS_MailCoreFactory_CID             \
-{ /* 18c2f985-b09f-11d2-bcde-00805f0e1353 */         \
-    0x18c2f985, 0xb09f, 0x11d2,                      \
-    {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53} \
+{ /* B2A68896-BFA2-11d2-96C8-0060B0FB9956 */         \
+    0xb2a68896, 0xbfa2, 0x11d2, { 0x96, 0xc8, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56 }  \
 }
 
 #define NS_TOOLBARCORE_CID                    \

xpfe/AppCores/public/nsIDOMToolbarCore.h

@@ -37,18 +37,22 @@ public:
 
   NS_IMETHOD    SetWindow(nsIDOMWindow* aWin)=0;
 
+  NS_IMETHOD    SetWebShellWindow(nsIDOMWindow* aWin)=0;
+
   NS_IMETHOD    SetStatus(const nsString& aMsg)=0;
 };
 
 
 #define NS_DECL_IDOMTOOLBARCORE   \
   NS_IMETHOD    SetWindow(nsIDOMWindow* aWin);  \
+  NS_IMETHOD    SetWebShellWindow(nsIDOMWindow* aWin);  \
   NS_IMETHOD    SetStatus(const nsString& aMsg);  \
 
 
 
 #define NS_FORWARD_IDOMTOOLBARCORE(_to)  \
   NS_IMETHOD    SetWindow(nsIDOMWindow* aWin) { return _to##SetWindow(aWin); }  \
+  NS_IMETHOD    SetWebShellWindow(nsIDOMWindow* aWin) { return _to##SetWebShellWindow(aWin); }  \
   NS_IMETHOD    SetStatus(const nsString& aMsg) { return _to##SetStatus(aMsg); }  \