Bug 236300 - Landing Safari profile migrator. Work by Ben and me. r=mconnor+josh/smfr. a=sjobs

browser/components/migration/content/migration.xul

@@ -65,8 +65,8 @@
       <radio id="phoenix"   label="&importFromPhoenix.label;"   accesskey="&importFromPhoenix.accesskey;"/>
 #ifdef XP_UNIX
 #ifdef XP_MACOSX
-<!-- XXXben - uncomment these as we write migrators for them
       <radio id="safari"    label="&importFromSafari.label;"    accesskey="&importFromSafari.accesskey;"/>
+<!-- XXXben - uncomment these as we write migrators for them
       <radio id="macie"     label="&importFromIE.label;"        accesskey="&importFromIE.accesskey;"/>
       <radio id="camino"    label="&importFromCamino.label;"    accesskey="&importFromCamino.accesskey;"/>
       <radio id="omniweb"   label="&importFromOmniWeb.label;"   accesskey="&importFromOmniWeb.accesskey;"/>

browser/components/migration/src/nsBrowserProfileMigratorUtils.h

@@ -55,6 +55,9 @@
     NOTIFY_OBSERVERS(MIGRATION_ITEMAFTERMIGRATE, index.get()); \
   }
 
+#define NC_URI(property) \
+  NS_LITERAL_CSTRING("http://home.netscape.com/NC-rdf#"#property)
+
 #include "nsIPrefBranch.h"
 #include "nsIFile.h"
 #include "nsString.h"

browser/components/migration/src/nsSafariProfileMigrator.h

@@ -20,6 +20,7 @@
  *
  * Contributor(s):
  *  Ben Goodger <ben@bengoodger.com>
+ *  Asaf Romano <mozilla.mano@sent.com>
  *
  * 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
@@ -44,9 +45,6 @@
 #include "nsString.h"
 
 #include <CoreFoundation/CoreFoundation.h>
-#include <CFNumber.h>
-#include <CFString.h>
-#include <CFBase.h>
 
 class nsSafariProfileMigrator : public nsIBrowserProfileMigrator
 {
@@ -82,7 +80,9 @@ public:
   static nsresult SetDownloadFolder(void* aTransform, nsIPrefBranch* aBranch);
   static nsresult SetDownloadHandlers(void* aTransform, nsIPrefBranch* aBranch);
   static nsresult SetDownloadRetention(void* aTransform, nsIPrefBranch* aBranch);
-  static nsresult SetGoogleBar(void* aTransform, nsIPrefBranch* aBranch);
+  static nsresult SetDisplayImages(void* aTransform, nsIPrefBranch* aBranch);
+  static nsresult SetFontName(void* aTransform, nsIPrefBranch* aBranch);
+  static nsresult SetFontSize(void* aTransform, nsIPrefBranch* aBranch);
   static void CleanResource(nsIRDFDataSource* aDataSource, nsIRDFResource* aResource);
 
 protected:
@@ -90,9 +90,18 @@ protected:
   nsresult CopyCookies(PRBool aReplace);
   nsresult CopyHistory(PRBool aReplace);
   nsresult CopyBookmarks(PRBool aReplace);
+  nsresult ParseBookmarksFolder(CFArrayRef aChildren, 
+                                nsIRDFResource* aParentResource,
+                                nsIBookmarksService* aBookmarksService,
+                                PRBool aIsAtRootLevel);
+  nsresult CopyFormData(PRBool aReplace);
+  nsresult CopyOtherData(PRBool aReplace);
+
+  nsresult ProfileHasContentStyleSheet(PRBool *outExists);
+  nsresult GetSafariUserStyleSheet(nsILocalFile** aResult);
 
 private:
   nsCOMPtr<nsIObserverService> mObserverService;
 };
  
-#endif
+#endif

browser/locales/en-US/chrome/browser/migration/migration.properties

@@ -32,40 +32,47 @@ importedOperaSearchUrls=Keyword Searches (From Opera)
 1_dogbert=Preferences
 1_seamonkey=Preferences
 1_phoenix=Preferences
+1_safari=Preferences
 
 2_ie=Cookies
 2_opera=Cookies
 2_dogbert=Cookies
 2_seamonkey=Cookies
 2_phoenix=Cookies
+2_safari=Cookies
 
 4_ie=Browsing History
 4_opera=Browsing History
 4_dogbert=Browsing History
 4_seamonkey=Browsing History
 4_phoenix=Browsing History
+4_safari=Browsing History
 
 8_ie=Saved Form History
 8_opera=Saved Form History
 8_dogbert=Saved Form History
 8_seamonkey=Saved Form History
 8_phoenix=Saved Form History
+8_safari=Saved Form History
 
 16_ie=Saved Passwords
 16_opera=Saved Passwords
 16_dogbert=Saved Passwords
 16_seamonkey=Saved Passwords
 16_phoenix=Saved Passwords
+16_safari=Saved Passwords
 
 32_ie=Favorites
 32_opera=Bookmarks
 32_dogbert=Bookmarks
 32_seamonkey=Bookmarks
 32_phoenix=Bookmarks
+32_safari=Bookmarks
 
 64_ie=Other Data
 64_opera=Other Data
 64_dogbert=Other Data
 64_seamonkey=Other Data
 64_phoenix=Other Data
+64_safari=Other Data