chrome/browser/chromeos/login/take_photo_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/take_photo_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/take_photo_view.cc

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

index 91674f2e1a5abf9ca29d9b6533a4d9fc7f942394..1046472f6e4bc2f20d71b67ec42859ca8f2bcb72 100644

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

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

@@ -108,7 +108,7 @@ class CameraImageView : public views::ImageView {

void SetMessage(const std::wstring& message) {

DCHECK(message_);

- message_->SetText(message);

+ message_->SetText(WideToUTF16Hack(message));

message_->SetVisible(!message.empty());

Layout();

}

@@ -161,7 +161,7 @@ TakePhotoView::~TakePhotoView() {

void TakePhotoView::Init() {

if (show_title_) {

title_label_ = new views::Label(

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

+ l10n_util::GetStringUTF16(IDS_USER_IMAGE_SCREEN_TITLE));

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

title_label_->SetMultiLine(true);

CorrectLabelFontSize(title_label_);