diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 22:18:25 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 22:18:25 +0000 |
| commit | 6235541680600aecf07e7e85a63dc0843f1b7084 (patch) | |
| tree | 76304d95b2638e9aa3eebfd5db6b2f2198e4da5d /chrome/browser/autocomplete/autocomplete_popup_model.cc | |
| parent | fd4aafc80ad6b4fc7dcbbe36dfec3b7e1bcbd707 (diff) | |
| download | chromium_src-6235541680600aecf07e7e85a63dc0843f1b7084.zip chromium_src-6235541680600aecf07e7e85a63dc0843f1b7084.tar.gz chromium_src-6235541680600aecf07e7e85a63dc0843f1b7084.tar.bz2 | |
Revert 71485 - Remove wstring from TemplateURL and friends.
BUG=23581
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6322001
TBR=avi@chromium.org
Review URL: http://codereview.chromium.org/6291003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71500 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete_popup_model.cc')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_popup_model.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_popup_model.cc b/chrome/browser/autocomplete/autocomplete_popup_model.cc index beb80c3..8af3572 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_model.cc +++ b/chrome/browser/autocomplete/autocomplete_popup_model.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,7 +9,6 @@ #include "unicode/ubidi.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/autocomplete/autocomplete_popup_view.h" @@ -208,7 +207,7 @@ bool AutocompletePopupModel::GetKeywordForMatch(const AutocompleteMatch& match, // If the current match is a keyword, return that as the selected keyword. if (TemplateURL::SupportsReplacement(match.template_url)) { - keyword->assign(UTF16ToWideHack(match.template_url->keyword())); + keyword->assign(match.template_url->keyword()); return false; } @@ -216,8 +215,8 @@ bool AutocompletePopupModel::GetKeywordForMatch(const AutocompleteMatch& match, if (!profile_->GetTemplateURLModel()) return false; profile_->GetTemplateURLModel()->Load(); - const string16 keyword_hint(TemplateURLModel::CleanUserInputKeyword( - WideToUTF16Hack(match.fill_into_edit))); + const std::wstring keyword_hint( + TemplateURLModel::CleanUserInputKeyword(match.fill_into_edit)); if (keyword_hint.empty()) return false; @@ -237,7 +236,7 @@ bool AutocompletePopupModel::GetKeywordForMatch(const AutocompleteMatch& match, return false; } - keyword->assign(UTF16ToWideHack(keyword_hint)); + keyword->assign(keyword_hint); return true; } |