diff options
| author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-11 21:08:53 +0000 |
|---|---|---|
| committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-11 21:08:53 +0000 |
| commit | 67cb4c8380be25c52627944e52a23eeb006484f6 (patch) | |
| tree | a10f968ed8b877475369489e8d8162b9be964385 /chrome/browser/importer/safari_importer.mm | |
| parent | 1c83eb444727c703709f7deea88e51f8da2e504e (diff) | |
| download | chromium_src-67cb4c8380be25c52627944e52a23eeb006484f6.zip chromium_src-67cb4c8380be25c52627944e52a23eeb006484f6.tar.gz chromium_src-67cb4c8380be25c52627944e52a23eeb006484f6.tar.bz2 | |
While importing favicon, make sure there is an entry in the history db.
This will match with what history db does for regular bookmarked URLs with favicons - when history db is cleaned, we keep an entry in the db with 0 visits as long as that url is bookmarked.
BUG=13338
Review URL: http://codereview.chromium.org/193053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26014 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer/safari_importer.mm')
| -rw-r--r-- | chrome/browser/importer/safari_importer.mm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/importer/safari_importer.mm b/chrome/browser/importer/safari_importer.mm index 1f839a7..e862b97 100644 --- a/chrome/browser/importer/safari_importer.mm +++ b/chrome/browser/importer/safari_importer.mm @@ -55,6 +55,11 @@ void SafariImporter::StartImport(ProfileInfo profile_info, NotifyStarted(); if ((items & HOME_PAGE) && !cancelled()) ImportHomepage(); // Doesn't have a UI item. + if ((items & HISTORY) && !cancelled()) { + NotifyItemStarted(HISTORY); + ImportHistory(); + NotifyItemEnded(HISTORY); + } if ((items & FAVORITES) && !cancelled()) { NotifyItemStarted(FAVORITES); ImportBookmarks(); @@ -65,11 +70,6 @@ void SafariImporter::StartImport(ProfileInfo profile_info, ImportPasswords(); NotifyItemEnded(PASSWORDS); } - if ((items & HISTORY) && !cancelled()) { - NotifyItemStarted(HISTORY); - ImportHistory(); - NotifyItemEnded(HISTORY); - } NotifyEnded(); } |