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

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

Issue 16561007: Use a direct include of utf_string_conversions.h in chrome/browser/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/bind.h" 9 #include "base/bind.h"
10 #include "base/rand_util.h" 10 #include "base/rand_util.h"
11 #include "base/strings/string_number_conversions.h" 11 #include "base/strings/string_number_conversions.h"
12 #include "base/strings/string_split.h" 12 #include "base/strings/string_split.h"
13 #include "base/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
14 #include "chrome/browser/bookmarks/imported_bookmark_entry.h" 14 #include "chrome/browser/bookmarks/imported_bookmark_entry.h"
15 #include "chrome/browser/first_run/first_run.h" 15 #include "chrome/browser/first_run/first_run.h"
16 #include "chrome/browser/importer/importer_bridge.h" 16 #include "chrome/browser/importer/importer_bridge.h"
17 #include "chrome/browser/importer/importer_data_types.h" 17 #include "chrome/browser/importer/importer_data_types.h"
18 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
19 #include "content/public/browser/browser_thread.h" 19 #include "content/public/browser/browser_thread.h"
20 #include "grit/generated_resources.h" 20 #include "grit/generated_resources.h"
21 #include "net/base/load_flags.h" 21 #include "net/base/load_flags.h"
22 #include "net/url_request/url_fetcher.h" 22 #include "net/url_request/url_fetcher.h"
23 #include "third_party/libxml/chromium/libxml_utils.h" 23 #include "third_party/libxml/chromium/libxml_utils.h"
(...skipping 540 matching lines...) Expand 10 before | Expand all | Expand 10 after
564 } 564 }
565 565
566 void Toolbar5Importer::AddBookmarksToChrome( 566 void Toolbar5Importer::AddBookmarksToChrome(
567 const std::vector<ImportedBookmarkEntry>& bookmarks) { 567 const std::vector<ImportedBookmarkEntry>& bookmarks) {
568 if (!bookmarks.empty() && !cancelled()) { 568 if (!bookmarks.empty() && !cancelled()) {
569 const string16& first_folder_name = 569 const string16& first_folder_name =
570 bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_GOOGLE_TOOLBAR); 570 bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_GOOGLE_TOOLBAR);
571 bridge_->AddBookmarks(bookmarks, first_folder_name); 571 bridge_->AddBookmarks(bookmarks, first_folder_name);
572 } 572 }
573 } 573 }
OLDNEW
« no previous file with comments | « chrome/browser/importer/safari_importer_unittest.mm ('k') | chrome/browser/importer/toolbar_importer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698