diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-02 15:02:45 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-02 15:02:45 +0000 |
| commit | aac7001d314a0bef70f5dd42a29105654916e0f0 (patch) | |
| tree | 7339afca9923b8d7e14cb5e14a62e38b055c195d /chrome/browser/importer/profile_writer.h | |
| parent | 5fc07eb1a6c22881419f906f087e798b746809c2 (diff) | |
| download | chromium_src-aac7001d314a0bef70f5dd42a29105654916e0f0.zip chromium_src-aac7001d314a0bef70f5dd42a29105654916e0f0.tar.gz chromium_src-aac7001d314a0bef70f5dd42a29105654916e0f0.tar.bz2 | |
importer: Convert AddBookmarkEntries to string16.
BUG=23581
TEST=None
R=avi@chromium.org
Review URL: http://codereview.chromium.org/6760037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80266 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer/profile_writer.h')
| -rw-r--r-- | chrome/browser/importer/profile_writer.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/importer/profile_writer.h b/chrome/browser/importer/profile_writer.h index 5313780b..79db950 100644 --- a/chrome/browser/importer/profile_writer.h +++ b/chrome/browser/importer/profile_writer.h @@ -90,7 +90,7 @@ class ProfileWriter : public base::RefCountedThreadSafe<ProfileWriter> { // if another bookmarks does not exist with the same title, path and // url. virtual void AddBookmarkEntry(const std::vector<BookmarkEntry>& bookmark, - const std::wstring& first_folder_name, + const string16& first_folder_name, int options); virtual void AddFavicons( const std::vector<history::ImportedFaviconUsage>& favicons); @@ -121,15 +121,15 @@ class ProfileWriter : public base::RefCountedThreadSafe<ProfileWriter> { private: // Generates a unique folder name. If folder_name is not unique, then this // repeatedly tests for '|folder_name| + (i)' until a unique name is found. - std::wstring GenerateUniqueFolderName(BookmarkModel* model, - const std::wstring& folder_name); + string16 GenerateUniqueFolderName(BookmarkModel* model, + const string16& folder_name); // Returns true if a bookmark exists with the same url, title and path // as |entry|. |first_folder_name| is the name to use for the first // path entry if |import_to_bookmark_bar| is true. bool DoesBookmarkExist(BookmarkModel* model, const BookmarkEntry& entry, - const std::wstring& first_folder_name, + const string16& first_folder_name, bool import_to_bookmark_bar); Profile* const profile_; |