Bug 586711 - Incubator embedding requires switching to XRE_InitEmbedding2. add missing nits fixes. r=mark.finkle
authorTatiana Meshkova <tanya.meshkova@gmail.com>
Wed, 18 Aug 2010 12:24:33 -0700
changeset 126 af6926dd204a95edab67916764dacbab0ff714f6
parent 125 607aad0e0aeacb5191d0af3617b745e54cbd384a
child 127 13ee3bfc6a101b4adb4b166bce524d8935231776
push id39
push userromaxa@gmail.com
push dateWed, 18 Aug 2010 19:25:13 +0000
reviewersmark.finkle
bugs586711
Bug 586711 - Incubator embedding requires switching to XRE_InitEmbedding2. add missing nits fixes. r=mark.finkle
common/EmbeddingSetup.cpp
common/EmbeddingSetup.h
--- a/common/EmbeddingSetup.cpp
+++ b/common/EmbeddingSetup.cpp
@@ -274,17 +274,17 @@ nsresult InitEmbedding(const char* aProf
         rv = XRE_LockProfileDirectory(sProfileDir, &sProfileLock);
         NS_ENSURE_SUCCESS(rv, rv);
     }
 
     // init embedding
     rv = XRE_InitEmbedding2(xuldir, appdir,
                            const_cast<MozEmbedDirectoryProvider*>(&kDirectoryProvider));
     if (NS_FAILED(rv)) {
-        cerr << "XRE_InitEmbedding failed." << endl;
+        cerr << "XRE_InitEmbedding2 failed." << endl;
         return 9;
     }
 
     // initialize profile:
     XRE_NotifyProfile();
 
     NS_LogTerm();
 
--- a/common/EmbeddingSetup.h
+++ b/common/EmbeddingSetup.h
@@ -49,20 +49,16 @@ typedef PRUint32 nsresult;
  *
  * You can call this as many times you like,
  * it will only do the initialization once,
  * but be sure to call TermEmbedding a matching number of times.
  *
  * @param aProfilePath Optional argument to set the path where
  *  profile data is stored. The directory will be created if it
  *  doesn't exist.
- * @param aComps Optional argument to register static
- *  components at startup.
- * @param aNumComps Optional argument to set number of
- *  static components.
  */
 nsresult InitEmbedding(const char* aProfilePath = 0);
 
 /**
  * Terminates embedding, i.e. does teardown and unloads needed libs.
  *
  * Make sure to match every call of InitEmbedding with a call
  * to TermEmbedding. Only the last call to TermEmbedding will do