diff options
author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-01 20:23:22 +0000 |
---|---|---|
committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-01 20:23:22 +0000 |
commit | 932289db27336277e6bab6fd48542db9cd513458 (patch) | |
tree | 13dda07348f3b520e128d2f0d1dd8794bf8c6ef7 /chrome/browser/importer/firefox2_importer.cc | |
parent | 04d34f27c22ef87e38df03d5effb26c38cfb8c92 (diff) | |
download | chromium_src-932289db27336277e6bab6fd48542db9cd513458.zip chromium_src-932289db27336277e6bab6fd48542db9cd513458.tar.gz chromium_src-932289db27336277e6bab6fd48542db9cd513458.tar.bz2 |
Revert change 6149 because it broke the unit tests on windows.
Review URL: http://codereview.chromium.org/12834
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6155 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer/firefox2_importer.cc')
-rw-r--r-- | chrome/browser/importer/firefox2_importer.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/chrome/browser/importer/firefox2_importer.cc b/chrome/browser/importer/firefox2_importer.cc index 9aee0ca..aef2ba2 100644 --- a/chrome/browser/importer/firefox2_importer.cc +++ b/chrome/browser/importer/firefox2_importer.cc @@ -4,9 +4,9 @@ #include "chrome/browser/importer/firefox2_importer.h" -#include "base/file_path.h" #include "base/file_util.h" #include "base/path_service.h" +#include "base/registry.h" #include "base/string_util.h" #include "base/values.h" #include "chrome/browser/importer/firefox_importer_utils.h" @@ -69,19 +69,16 @@ void Firefox2Importer::StartImport(ProfileInfo profile_info, // static void Firefox2Importer::LoadDefaultBookmarks(const std::wstring& app_path, std::set<GURL> *urls) { - // TODO(port): Code below is correct only on Windows. // Firefox keeps its default bookmarks in a bookmarks.html file that // lives at: <Firefox install dir>\defaults\profile\bookmarks.html - FilePath file = FilePath::FromWStringHack(app_path); - file.Append(FILE_PATH_LITERAL("defaults")); - file.Append(FILE_PATH_LITERAL("profile")); - file.Append(FILE_PATH_LITERAL("bookmarks.html")); + std::wstring file = app_path; + file_util::AppendToPath(&file, L"defaults\\profile\\bookmarks.html"); urls->clear(); // Read the whole file. std::string content; - file_util::ReadFileToString(file.ToWStringHack(), &content); + file_util::ReadFileToString(file, &content); std::vector<std::string> lines; SplitString(content, '\n', &lines); |