diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-09 05:20:49 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-09 05:20:49 +0000 |
| commit | d63d07d40eca9f30f322a6dd5d21a6aa74de1e30 (patch) | |
| tree | f634215f448bfacd168db942e24c162b73b38685 /chrome/browser/importer | |
| parent | 62054bb3bbe80a503a2d5bf407161c9417ff9228 (diff) | |
| download | chromium_src-d63d07d40eca9f30f322a6dd5d21a6aa74de1e30.zip chromium_src-d63d07d40eca9f30f322a6dd5d21a6aa74de1e30.tar.gz chromium_src-d63d07d40eca9f30f322a6dd5d21a6aa74de1e30.tar.bz2 | |
When importing bookmarks from Firefox, filter out the default bookmarks.
The existing code attempted to do this but it had a bug.
BUG=18530
Review URL: http://codereview.chromium.org/165094
Patch from Doug Muir <dmuir@google.com>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22884 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer')
| -rw-r--r-- | chrome/browser/importer/firefox2_importer.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/chrome/browser/importer/firefox2_importer.cc b/chrome/browser/importer/firefox2_importer.cc index 38fe89e..95d7eb9 100644 --- a/chrome/browser/importer/firefox2_importer.cc +++ b/chrome/browser/importer/firefox2_importer.cc @@ -75,13 +75,10 @@ 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.AppendASCII("defaults"); - file.AppendASCII("profile"); - file.AppendASCII("bookmarks.html"); + file = file.AppendASCII("defaults"); + file = file.AppendASCII("profile"); + file = file.AppendASCII("bookmarks.html"); urls->clear(); |