Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Side by Side Diff: chrome/browser/importer/toolbar_importer.cc

Issue 3447008: base: Finish moving the SplitString functions from string_util.h to string_split.h (Closed) Base URL: git://git.chromium.org/chromium.git
Patch Set: chromeos fixes Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/importer/nss_decryptor.cc ('k') | chrome/browser/io_thread.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_split.h"
10 #include "base/string_util.h" 11 #include "base/string_util.h"
11 #include "base/string_number_conversions.h" 12 #include "base/string_number_conversions.h"
12 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
13 #include "base/values.h" 14 #include "base/values.h"
14 #include "chrome/browser/chrome_thread.h" 15 #include "chrome/browser/chrome_thread.h"
15 #include "chrome/browser/first_run/first_run.h" 16 #include "chrome/browser/first_run/first_run.h"
16 #include "chrome/browser/importer/importer_bridge.h" 17 #include "chrome/browser/importer/importer_bridge.h"
17 #include "chrome/browser/importer/importer_data_types.h" 18 #include "chrome/browser/importer/importer_data_types.h"
18 #include "chrome/browser/profile.h" 19 #include "chrome/browser/profile.h"
19 #include "chrome/common/libxml_utils.h" 20 #include "chrome/common/libxml_utils.h"
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after
591 void Toolbar5Importer::AddBookmarksToChrome( 592 void Toolbar5Importer::AddBookmarksToChrome(
592 const std::vector<ProfileWriter::BookmarkEntry>& bookmarks) { 593 const std::vector<ProfileWriter::BookmarkEntry>& bookmarks) {
593 if (!bookmarks.empty() && !cancelled()) { 594 if (!bookmarks.empty() && !cancelled()) {
594 const std::wstring& first_folder_name = 595 const std::wstring& first_folder_name =
595 bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_GOOGLE_TOOLBAR); 596 bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_GOOGLE_TOOLBAR);
596 int options = ProfileWriter::ADD_IF_UNIQUE | 597 int options = ProfileWriter::ADD_IF_UNIQUE |
597 (import_to_bookmark_bar() ? ProfileWriter::IMPORT_TO_BOOKMARK_BAR : 0); 598 (import_to_bookmark_bar() ? ProfileWriter::IMPORT_TO_BOOKMARK_BAR : 0);
598 bridge_->AddBookmarkEntries(bookmarks, first_folder_name, options); 599 bridge_->AddBookmarkEntries(bookmarks, first_folder_name, options);
599 } 600 }
600 } 601 }
OLDNEW
« no previous file with comments | « chrome/browser/importer/nss_decryptor.cc ('k') | chrome/browser/io_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698