Bug 548614 - use define instead of literal string for windows favorites dir (r=gavin)
authorDietrich Ayala <dietrich@mozilla.com>
Thu, 25 Feb 2010 11:34:42 -0800
changeset 38710 575fe0710b22dd07a71d5d0863f0d7bc250f4ba5
parent 38709 d38a004893a540fa7169201da019c7632895e18f
child 38711 ccdba3c82b65b6b8fac0008f30760316434e888c
push id11814
push userdietrich@mozilla.com
push dateThu, 25 Feb 2010 19:35:23 +0000
treeherderautoland@575fe0710b22 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgavin
bugs548614
milestone1.9.3a2pre
Bug 548614 - use define instead of literal string for windows favorites dir (r=gavin)
browser/components/migration/src/nsIEProfileMigrator.cpp
--- a/browser/components/migration/src/nsIEProfileMigrator.cpp
+++ b/browser/components/migration/src/nsIEProfileMigrator.cpp
@@ -1415,17 +1415,17 @@ nsIEProfileMigrator::CopyFavoritesBatche
     }
     folder = bookmarksMenuFolderId;
   }
 
   nsCOMPtr<nsIProperties> fileLocator =
     do_GetService("@mozilla.org/file/directory_service;1", &rv);
   NS_ENSURE_SUCCESS(rv, rv);
   nsCOMPtr<nsIFile> favoritesDirectory;
-  (void)fileLocator->Get("Favs", NS_GET_IID(nsIFile),
+  (void)fileLocator->Get(NS_WIN_FAVORITES_DIR, NS_GET_IID(nsIFile),
                          getter_AddRefs(favoritesDirectory));
 
   // If |favoritesDirectory| is null, it means that we're on a Windows
   // platform that does not have a Favorites folder, e.g. Windows 95
   // (early SRs, before IE integrated with the shell).
   // Only try to read Favorites folder if it exists on the machine.
   if (favoritesDirectory) {
     rv = ParseFavoritesFolder(favoritesDirectory, folder, bms,