| Index: chrome/utility/importer/bookmarks_file_importer.cc
|
| diff --git a/chrome/utility/importer/bookmarks_file_importer.cc b/chrome/utility/importer/bookmarks_file_importer.cc
|
| index 387257de20d20f60befe1f70d458fcbf0b36d022..a73f63083ee83a7202cd7d4b83043d34dc9b1f77 100644
|
| --- a/chrome/utility/importer/bookmarks_file_importer.cc
|
| +++ b/chrome/utility/importer/bookmarks_file_importer.cc
|
| @@ -90,6 +90,7 @@ void BookmarksFileImporter::StartImport(
|
| bridge->NotifyItemStarted(importer::FAVORITES);
|
|
|
| std::vector<ImportedBookmarkEntry> bookmarks;
|
| + std::vector<importer::URLKeywordInfo> url_keywords;
|
| std::vector<ImportedFaviconUsage> favicons;
|
|
|
| bookmark_html_reader::ImportBookmarksFile(
|
| @@ -97,6 +98,7 @@ void BookmarksFileImporter::StartImport(
|
| base::Bind(internal::CanImportURL),
|
| source_profile.source_path,
|
| &bookmarks,
|
| + &url_keywords,
|
| &favicons);
|
|
|
| if (!bookmarks.empty() && !cancelled()) {
|
| @@ -104,6 +106,9 @@ void BookmarksFileImporter::StartImport(
|
| bridge->GetLocalizedString(IDS_BOOKMARK_GROUP);
|
| bridge->AddBookmarks(bookmarks, first_folder_name);
|
| }
|
| + if (!url_keywords.empty() && !cancelled()) {
|
| + bridge->SetKeywords(url_keywords, false);
|
| + }
|
| if (!favicons.empty())
|
| bridge->SetFavicons(favicons);
|
|
|
|
|