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/possible_url_model.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/possible_url_model.cc')
| -rw-r--r-- | chrome/browser/possible_url_model.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/possible_url_model.cc b/chrome/browser/possible_url_model.cc index 70b4319..370163d 100644 --- a/chrome/browser/possible_url_model.cc +++ b/chrome/browser/possible_url_model.cc @@ -53,7 +53,7 @@ void PossibleURLModel::Reload(Profile *profile) { options.end_time - TimeDelta::FromDays(kPossibleURLTimeScope); options.max_count = 50; - hs->QueryHistory(std::wstring(), options, &consumer_, + hs->QueryHistory(string16(), options, &consumer_, NewCallback(this, &PossibleURLModel::OnHistoryQueryComplete)); } } @@ -69,7 +69,7 @@ void PossibleURLModel::OnHistoryQueryComplete(HistoryService::Handle h, results_[i].index = i; results_[i].display_url = gfx::SortedDisplayURL((*result)[i].url(), languages); - results_[i].title = (*result)[i].title(); + results_[i].title = UTF16ToWide((*result)[i].title()); } // The old version of this code would filter out all but the most recent |