Add nsEmbedCID and move the webbrowser contractid to it. Bug 258039, r=darin

git-svn-id: svn://10.0.0.236/trunk@170246 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/embedding/base/Makefile.in

@@ -56,6 +56,7 @@ DEFINES += -DMOZILLA_STRICT_API
 
 SDK_HEADERS         = \
                 nsEmbedAPI.h \
+                nsEmbedCID.h \
                 $(NULL)
 
 SDK_XPIDLSRCS   = \

mozilla/embedding/base/nsEmbedCID.h

@@ -0,0 +1,61 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Boris Zbarsky <bzbarsky@mit.edu>.
+ * Portions created by the Initial Developer are Copyright (C) 2005
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef NSEMBEDCID_H
+#define NSEMBEDCID_H
+
+/**
+ * @file
+ * @brief List of, and documentation for, frozen Gecko embedding contracts.
+ */
+
+/**
+ * Web Browser ContractID
+ *   The web browser is the basic way to instantiate a Gecko browser.
+ *
+ * This contract implements the following interfaces:
+ * nsIWebBrowser
+ * nsIWebBrowserSetup
+ * nsIInterfaceRequestor
+ *
+ * @note This contract does not guarantee implementation of any other
+ * interfaces and does not guarantee ability to get any particular
+ * interfaces via the nsIInterfaceRequestor implementation.
+ */
+#define NS_WEBBROWSER_CONTRACTID \
+  "@mozilla.org/embedding/browser/nsWebBrowser;1"
+
+#endif // NSEMBEDCID_H

mozilla/embedding/browser/build/Makefile.in

@@ -66,6 +66,7 @@ REQUIRES	= xpcom \
 		  shistory \
 		  windowwatcher \
 		  webbrowserpersist \
+		  embed_base \
 		  $(NULL)
 
 ifeq (,$(filter-out WINCE WINNT,$(OS_ARCH)))

mozilla/embedding/browser/build/nsWebBrowserModule.cpp

@@ -43,6 +43,8 @@
 #include "nsICategoryManager.h"
 #include "nsXPIDLString.h"
 
+#include "nsEmbedCID.h"
+
 #include "nsWebBrowser.h"
 #include "nsCommandHandler.h"
 #include "nsWebBrowserContentPolicy.h"

mozilla/embedding/browser/webBrowser/Makefile.in

@@ -67,6 +67,7 @@ REQUIRES	= xpcom \
 		  unicharutil \
 		  imglib2 \
 		  locale \
+		  embed_base \
 		  $(NULL)
 
 ifdef MOZ_PHOENIX

mozilla/embedding/browser/webBrowser/nsCWebBrowser.idl

@@ -63,9 +63,5 @@ nsIInterfaceRequestor
 */
 
 %{ C++
-//	{F1EAC761-87E9-11d3-AF80-00A024FFC08C} - 
-#define NS_WEBBROWSER_CID \
-{ 0xf1eac761, 0x87e9, 0x11d3, { 0xaf, 0x80, 0x00, 0xa0, 0x24, 0xff, 0xc0, 0x8c } }
-#define NS_WEBBROWSER_CONTRACTID \
-"@mozilla.org/embedding/browser/nsWebBrowser;1"
+#include "nsEmbedCID.h"
 %}

mozilla/embedding/browser/webBrowser/nsWebBrowser.h

@@ -99,6 +99,11 @@ public:
     nsIID mID;
 };
 
+//  {F1EAC761-87E9-11d3-AF80-00A024FFC08C} - 
+#define NS_WEBBROWSER_CID \
+{0xf1eac761, 0x87e9, 0x11d3, { 0xaf, 0x80, 0x00, 0xa0, 0x24, 0xff, 0xc0, 0x8c }}
+
+
 class nsWebBrowser : public nsIWebBrowser,
                      public nsIWebNavigation,
                      public nsIWebBrowserSetup,