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

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

Issue 3076013: Move ASCIIToWide and ASCIIToUTF16 to utf_string_conversions.h. I've found it... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 4 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) 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_util.h"
10 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
11 #include "chrome/browser/chrome_thread.h" 12 #include "chrome/browser/chrome_thread.h"
12 #include "chrome/browser/first_run.h" 13 #include "chrome/browser/first_run.h"
13 #include "chrome/browser/importer/importer_bridge.h" 14 #include "chrome/browser/importer/importer_bridge.h"
14 #include "chrome/browser/importer/importer_data_types.h" 15 #include "chrome/browser/importer/importer_data_types.h"
15 #include "chrome/browser/profile.h" 16 #include "chrome/browser/profile.h"
16 #include "chrome/common/libxml_utils.h" 17 #include "chrome/common/libxml_utils.h"
17 #include "chrome/common/net/url_request_context_getter.h" 18 #include "chrome/common/net/url_request_context_getter.h"
18 #include "grit/generated_resources.h" 19 #include "grit/generated_resources.h"
19 #include "net/base/cookie_monster.h" 20 #include "net/base/cookie_monster.h"
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 void Toolbar5Importer::AddBookmarksToChrome( 589 void Toolbar5Importer::AddBookmarksToChrome(
589 const std::vector<ProfileWriter::BookmarkEntry>& bookmarks) { 590 const std::vector<ProfileWriter::BookmarkEntry>& bookmarks) {
590 if (!bookmarks.empty() && !cancelled()) { 591 if (!bookmarks.empty() && !cancelled()) {
591 const std::wstring& first_folder_name = 592 const std::wstring& first_folder_name =
592 bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_GOOGLE_TOOLBAR); 593 bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_GOOGLE_TOOLBAR);
593 int options = ProfileWriter::ADD_IF_UNIQUE | 594 int options = ProfileWriter::ADD_IF_UNIQUE |
594 (import_to_bookmark_bar() ? ProfileWriter::IMPORT_TO_BOOKMARK_BAR : 0); 595 (import_to_bookmark_bar() ? ProfileWriter::IMPORT_TO_BOOKMARK_BAR : 0);
595 bridge_->AddBookmarkEntries(bookmarks, first_folder_name, options); 596 bridge_->AddBookmarkEntries(bookmarks, first_folder_name, options);
596 } 597 }
597 } 598 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698