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

Unified Diff: chrome/utility/importer/firefox_importer.cc

Issue 94013004: Add base:: to string16s in chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: try again Created 7 years 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 side-by-side diff with in-line comments
Download patch
Index: chrome/utility/importer/firefox_importer.cc
diff --git a/chrome/utility/importer/firefox_importer.cc b/chrome/utility/importer/firefox_importer.cc
index ab7d2966ec605cc90cc5aa594bd556413dc1731a..3c826d29e58748c38a88cc212a220aca198d5348 100644
--- a/chrome/utility/importer/firefox_importer.cc
+++ b/chrome/utility/importer/firefox_importer.cc
@@ -81,7 +81,7 @@ struct FirefoxImporter::BookmarkItem {
int parent;
int id;
GURL url;
- string16 title;
+ base::string16 title;
BookmarkItemType type;
std::string keyword;
base::Time date_added;
@@ -258,7 +258,7 @@ void FirefoxImporter::ImportBookmarks() {
continue;
// Find the bookmark path by tracing their links to parent folders.
- std::vector<string16> path;
+ std::vector<base::string16> path;
BookmarkItem* child = item;
bool found_path = false;
bool is_in_toolbar = false;
@@ -321,7 +321,7 @@ void FirefoxImporter::ImportBookmarks() {
// Write into profile.
if (!bookmarks.empty() && !cancelled()) {
- const string16& first_folder_name =
+ const base::string16& first_folder_name =
bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_FIREFOX);
bridge_->AddBookmarks(bookmarks, first_folder_name);
}

Powered by Google App Engine
This is Rietveld 408576698