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

Unified Diff: chrome/utility/importer/safari_importer.h

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
« no previous file with comments | « chrome/utility/importer/nss_decryptor_win.h ('k') | chrome/utility/importer/safari_importer.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/utility/importer/safari_importer.h
diff --git a/chrome/utility/importer/safari_importer.h b/chrome/utility/importer/safari_importer.h
index ea64284105a873f7e5707cbf79772f85771430f6..756dac9c78f038da184ec9b15333e99c1100fa30 100644
--- a/chrome/utility/importer/safari_importer.h
+++ b/chrome/utility/importer/safari_importer.h
@@ -61,7 +61,7 @@ class SafariImporter : public Importer {
void ImportHistory();
// Parse Safari's stored bookmarks.
- void ParseBookmarks(const string16& toolbar_name,
+ void ParseBookmarks(const base::string16& toolbar_name,
std::vector<ImportedBookmarkEntry>* bookmarks);
// Function to recursively read Bookmarks out of Safari plist.
@@ -71,9 +71,9 @@ class SafariImporter : public Importer {
// |out_bookmarks| BookMark element array to write into.
void RecursiveReadBookmarksFolder(
NSDictionary* bookmark_folder,
- const std::vector<string16>& parent_path_elements,
+ const std::vector<base::string16>& parent_path_elements,
bool is_in_toolbar,
- const string16& toolbar_name,
+ const base::string16& toolbar_name,
std::vector<ImportedBookmarkEntry>* out_bookmarks);
// Converts history time stored by Safari as a double serialized as a string,
« no previous file with comments | « chrome/utility/importer/nss_decryptor_win.h ('k') | chrome/utility/importer/safari_importer.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698