summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-30 05:31:40 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-30 05:31:40 +0000
commit440b37b2c3a29be151a7262d9188d5e8151176fb (patch)
treeb2cc9283d1efd597472619dcfd016a4a0f0e32ff /chrome/browser/autocomplete
parent6cd3bd20cd448bc1bca33748395bf4381dfb7fc6 (diff)
downloadchromium_src-440b37b2c3a29be151a7262d9188d5e8151176fb.zip
chromium_src-440b37b2c3a29be151a7262d9188d5e8151176fb.tar.gz
chromium_src-440b37b2c3a29be151a7262d9188d5e8151176fb.tar.bz2
Remove the wstring TreeModelNode::GetTitle() and rename GetTitleAsString16() to GetTitle().
BUG=23581 TEST=builds and passes tests Review URL: http://codereview.chromium.org/3279005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57834 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
-rw-r--r--chrome/browser/autocomplete/history_contents_provider.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/autocomplete/history_contents_provider.cc b/chrome/browser/autocomplete/history_contents_provider.cc
index 3e4917a..da748d7 100644
--- a/chrome/browser/autocomplete/history_contents_provider.cc
+++ b/chrome/browser/autocomplete/history_contents_provider.cc
@@ -7,6 +7,7 @@
#include "base/callback.h"
#include "base/histogram.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/bookmarks/bookmark_utils.h"
#include "chrome/browser/history/query_parser.h"
@@ -278,6 +279,6 @@ void HistoryContentsProvider::QueryBookmarks(const AutocompleteInput& input) {
void HistoryContentsProvider::AddBookmarkTitleMatchToResults(
const bookmark_utils::TitleMatch& match) {
history::URLResult url_result(match.node->GetURL(), match.match_positions);
- url_result.set_title(WideToUTF16(match.node->GetTitle()));
+ url_result.set_title(match.node->GetTitle());
results_.AppendURLBySwapping(&url_result);
}