| OLD | NEW |
|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/toolbar_importer.h" | 5 #include "chrome/browser/importer/toolbar_importer.h" |
| 6 | 6 |
| 7 #include <limits> | 7 #include <limits> |
| 8 | 8 |
| 9 #include "base/rand_util.h" | 9 #include "base/rand_util.h" |
| 10 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
| (...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 549 } | 549 } |
| 550 | 550 |
| 551 return true; | 551 return true; |
| 552 } | 552 } |
| 553 | 553 |
| 554 void Toolbar5Importer::AddBookmarksToChrome( | 554 void Toolbar5Importer::AddBookmarksToChrome( |
| 555 const std::vector<ProfileWriter::BookmarkEntry>& bookmarks) { | 555 const std::vector<ProfileWriter::BookmarkEntry>& bookmarks) { |
| 556 if (!bookmarks.empty() && !cancelled()) { | 556 if (!bookmarks.empty() && !cancelled()) { |
| 557 const string16& first_folder_name = | 557 const string16& first_folder_name = |
| 558 bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_GOOGLE_TOOLBAR); | 558 bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_GOOGLE_TOOLBAR); |
| 559 int options = ProfileWriter::ADD_IF_UNIQUE | | 559 bridge_->AddBookmarks(bookmarks, first_folder_name); |
| 560 (import_to_bookmark_bar() ? ProfileWriter::IMPORT_TO_BOOKMARK_BAR : 0); | |
| 561 bridge_->AddBookmarks(bookmarks, first_folder_name, options); | |
| 562 } | 560 } |
| 563 } | 561 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 6979007:
Many fixes to bookmark importing. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src