chrome/browser/ui/views/location_bar/selected_keyword_view.cc - Issue 6256010: Revert 72380 - Remove wstring from autocomplete....

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/location_bar/selected_keyword_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:

Index: chrome/browser/ui/views/location_bar/selected_keyword_view.cc

===================================================================

--- chrome/browser/ui/views/location_bar/selected_keyword_view.cc (revision 72383)

+++ chrome/browser/ui/views/location_bar/selected_keyword_view.cc (working copy)

@@ -50,7 +50,7 @@

IconLabelBubbleView::Layout();

}

-void SelectedKeywordView::SetKeyword(const string16& keyword) {

+void SelectedKeywordView::SetKeyword(const std::wstring& keyword) {

keyword_ = keyword;

if (keyword.empty())

return;

@@ -60,7 +60,7 @@

bool is_extension_keyword;

const 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_TEXT : IDS_OMNIBOX_KEYWORD_TEXT;

full_label_.SetText(UTF16ToWide(

Property changes on: chrome/browser/ui/views/location_bar/selected_keyword_view.cc

___________________________________________________________________

Added: svn:mergeinfo