| OLD | NEW | 
|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "chrome/browser/importer/bookmarks_file_importer.h" | 5 #include "chrome/browser/importer/bookmarks_file_importer.h" | 
| 6 | 6 | 
| 7 #include "base/bind.h" | 7 #include "base/bind.h" | 
| 8 #include "chrome/browser/importer/bookmark_html_reader.h" | 8 #include "chrome/browser/importer/bookmark_html_reader.h" | 
| 9 #include "chrome/browser/importer/firefox_importer_utils.h" | 9 #include "chrome/browser/importer/firefox_importer_utils.h" | 
| 10 #include "chrome/browser/importer/importer_bridge.h" | 10 #include "chrome/browser/importer/importer_bridge.h" | 
| 11 #include "chrome/browser/importer/importer_data_types.h" |  | 
| 12 #include "chrome/common/importer/imported_bookmark_entry.h" | 11 #include "chrome/common/importer/imported_bookmark_entry.h" | 
| 13 #include "chrome/common/importer/imported_favicon_usage.h" | 12 #include "chrome/common/importer/imported_favicon_usage.h" | 
|  | 13 #include "chrome/common/importer/importer_data_types.h" | 
| 14 #include "grit/generated_resources.h" | 14 #include "grit/generated_resources.h" | 
| 15 | 15 | 
| 16 namespace { | 16 namespace { | 
| 17 | 17 | 
| 18 bool IsImporterCancelled(BookmarksFileImporter* importer) { | 18 bool IsImporterCancelled(BookmarksFileImporter* importer) { | 
| 19   return importer->cancelled(); | 19   return importer->cancelled(); | 
| 20 } | 20 } | 
| 21 | 21 | 
| 22 }  // namespace | 22 }  // namespace | 
| 23 | 23 | 
| (...skipping 26 matching lines...) Expand all  Loading... | 
| 50     base::string16 first_folder_name = | 50     base::string16 first_folder_name = | 
| 51         bridge->GetLocalizedString(IDS_BOOKMARK_GROUP); | 51         bridge->GetLocalizedString(IDS_BOOKMARK_GROUP); | 
| 52     bridge->AddBookmarks(bookmarks, first_folder_name); | 52     bridge->AddBookmarks(bookmarks, first_folder_name); | 
| 53   } | 53   } | 
| 54   if (!favicons.empty()) | 54   if (!favicons.empty()) | 
| 55     bridge->SetFavicons(favicons); | 55     bridge->SetFavicons(favicons); | 
| 56 | 56 | 
| 57   bridge->NotifyItemEnded(importer::FAVORITES); | 57   bridge->NotifyItemEnded(importer::FAVORITES); | 
| 58   bridge->NotifyEnded(); | 58   bridge->NotifyEnded(); | 
| 59 } | 59 } | 
| OLD | NEW | 
|---|