diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-23 15:35:25 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-23 15:35:25 +0000 |
commit | e5366896e9ccb3dd17c590d115bd999e987a33af (patch) | |
tree | 52f4fc2f07b73aaca1199adb1384b123130c22ed /chrome/browser/history/history_publisher.cc | |
parent | b133cc2db84fc83d5c4aa53020237788fa344c75 (diff) | |
download | chromium_src-e5366896e9ccb3dd17c590d115bd999e987a33af.zip chromium_src-e5366896e9ccb3dd17c590d115bd999e987a33af.tar.gz chromium_src-e5366896e9ccb3dd17c590d115bd999e987a33af.tar.bz2 |
Replace wstring with string16 in history. The only time wstring is used now in history is for bookmark-related stuff (the bookmarks system is still wstring-based).
The substantial change here is in RTL to make a string16 variant of the functions and in changing the WordIterator to use string16 (this cleaned up some weird utf-32 code).
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/2808017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50597 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/history_publisher.cc')
-rw-r--r-- | chrome/browser/history/history_publisher.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/history/history_publisher.cc b/chrome/browser/history/history_publisher.cc index 2c70a31..0392632 100644 --- a/chrome/browser/history/history_publisher.cc +++ b/chrome/browser/history/history_publisher.cc @@ -27,14 +27,15 @@ void HistoryPublisher::PublishPageThumbnail( void HistoryPublisher::PublishPageContent(const base::Time& time, const GURL& url, - const std::wstring& title, + const string16& title, const string16& contents) const { + std::wstring wide_title = UTF16ToWide(title); std::wstring wide_contents = UTF16ToWide(contents); PageData page_data = { time, url, wide_contents.c_str(), - title.c_str(), + wide_title.c_str(), NULL, NULL, }; |