Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3619)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/views/location_bar/keyword_hint_view.cc

Issue 6256010: Revert 72380 - Remove wstring from autocomplete.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/location_bar/keyword_hint_view.h ('k') | chrome/browser/ui/views/location_bar/location_bar_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/location_bar/keyword_hint_view.cc
===================================================================
--- chrome/browser/ui/views/location_bar/keyword_hint_view.cc (revision 72383)
+++ chrome/browser/ui/views/location_bar/keyword_hint_view.cc (working copy)
@@ -48,7 +48,7 @@
trailing_label_->SetColor(color);
}
-void KeywordHintView::SetKeyword(const string16& keyword) {
+void KeywordHintView::SetKeyword(const std::wstring& keyword) {
keyword_ = keyword;
if (keyword_.empty())
return;
@@ -59,7 +59,7 @@
std::vector<size_t> content_param_offsets;
bool is_extension_keyword;
string16 short_name = profile_->GetTemplateURLModel()->
- GetKeywordShortName(keyword, &is_extension_keyword);
+ GetKeywordShortName(WideToUTF16Hack(keyword), &is_extension_keyword);
int message_id = is_extension_keyword ?
IDS_OMNIBOX_EXTENSION_KEYWORD_HINT : IDS_OMNIBOX_KEYWORD_HINT;
const std::wstring keyword_hint =
Property changes on: chrome/browser/ui/views/location_bar/keyword_hint_view.cc
___________________________________________________________________
Added: svn:mergeinfo
« no previous file with comments | « chrome/browser/ui/views/location_bar/keyword_hint_view.h ('k') | chrome/browser/ui/views/location_bar/location_bar_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698