chrome/browser/chromeos/login/password_changed_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/chromeos/login/password_changed_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/chromeos/login/password_changed_view.cc

diff --git a/chrome/browser/chromeos/login/password_changed_view.cc b/chrome/browser/chromeos/login/password_changed_view.cc

index 131c3c25ef6a5f2ef671162e8eacfacc00127743..c85c73e89bf1a2697333a2ecbb1aac8c82c2a8c4 100644

--- a/chrome/browser/chromeos/login/password_changed_view.cc

+++ b/chrome/browser/chromeos/login/password_changed_view.cc

@@ -97,12 +97,12 @@ void PasswordChangedView::Init() {

title_label_ = new Label();

title_label_->SetFont(title_font);

title_label_->SetText(

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

+ l10n_util::GetStringUTF16(IDS_LOGIN_PASSWORD_CHANGED_TITLE));

title_label_->SetHorizontalAlignment(Label::ALIGN_LEFT);

description_label_ = new Label();

description_label_->SetText(

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

+ l10n_util::GetStringUTF16(IDS_LOGIN_PASSWORD_CHANGED_DESC));

description_label_->SetMultiLine(true);

description_label_->SetHorizontalAlignment(Label::ALIGN_LEFT);