summaryrefslogtreecommitdiffstats
path: root/chrome/utility/importer/firefox_importer.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/utility/importer/firefox_importer.cc')
-rw-r--r--chrome/utility/importer/firefox_importer.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/utility/importer/firefox_importer.cc b/chrome/utility/importer/firefox_importer.cc
index ab7d296..3c826d2 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);
}