chrome/browser/ui/views/instant_confirm_view.cc - Issue 8113031: Change std::wstring to string16 for views::Label and 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/instant_confirm_view.cc

Issue 8113031: Change std::wstring to string16 for views::Label and views::Link (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase 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/instant_confirm_view.cc

diff --git a/chrome/browser/ui/views/instant_confirm_view.cc b/chrome/browser/ui/views/instant_confirm_view.cc

index 673dfe9457b012e74cffe6f9827c598c7f0c7ba2..0bc68695a1965cf60e2ccb3c066e11cdf2484c13 100644

--- a/chrome/browser/ui/views/instant_confirm_view.cc

+++ b/chrome/browser/ui/views/instant_confirm_view.cc

@@ -22,12 +22,12 @@

InstantConfirmView::InstantConfirmView(Profile* profile) : profile_(profile) {

views::Label* description_label = new views::Label(

- UTF16ToWide(l10n_util::GetStringUTF16(IDS_INSTANT_OPT_IN_MESSAGE)));

+ l10n_util::GetStringUTF16(IDS_INSTANT_OPT_IN_MESSAGE));

description_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);

description_label->SetMultiLine(true);

views::Link* learn_more_link = new views::Link(

- UTF16ToWide(l10n_util::GetStringUTF16(IDS_LEARN_MORE)));

+ l10n_util::GetStringUTF16(IDS_LEARN_MORE));

learn_more_link->SetHorizontalAlignment(views::Label::ALIGN_LEFT);

learn_more_link->set_listener(this);