chrome/browser/ui/views/location_bar/selected_keyword_view.cc - Issue 8142026: Revert 104076 - Change std::wstring to string16 for views::Link

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 8142026: Revert 104076 - Change std::wstring to string16 for views::Link (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 2 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 104083)

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

@@ -66,11 +66,12 @@

&is_extension_keyword);

int message_id = is_extension_keyword ?

IDS_OMNIBOX_EXTENSION_KEYWORD_TEXT : IDS_OMNIBOX_KEYWORD_TEXT;

- full_label_.SetText(

- l10n_util::GetStringFUTF16(message_id, short_name));

+ full_label_.SetText(UTF16ToWide(

+ l10n_util::GetStringFUTF16(message_id, short_name)));

const std::wstring min_string(

location_bar_util::CalculateMinString(UTF16ToWide(short_name)));

partial_label_.SetText(min_string.empty() ?

full_label_.GetText() :

- l10n_util::GetStringFUTF16(message_id, WideToUTF16(min_string)));

+ UTF16ToWide(l10n_util::GetStringFUTF16(message_id,

+ WideToUTF16(min_string))));

}