Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1633)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/login/take_photo_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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/login/password_changed_view.cc ('k') | chrome/browser/chromeos/login/update_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/take_photo_view.cc
===================================================================
--- chrome/browser/chromeos/login/take_photo_view.cc (revision 104083)
+++ chrome/browser/chromeos/login/take_photo_view.cc (working copy)
@@ -108,7 +108,7 @@
void SetMessage(const std::wstring& message) {
DCHECK(message_);
- message_->SetText(WideToUTF16Hack(message));
+ message_->SetText(message);
message_->SetVisible(!message.empty());
Layout();
}
@@ -161,7 +161,7 @@
void TakePhotoView::Init() {
if (show_title_) {
title_label_ = new views::Label(
- l10n_util::GetStringUTF16(IDS_USER_IMAGE_SCREEN_TITLE));
+ UTF16ToWide(l10n_util::GetStringUTF16(IDS_USER_IMAGE_SCREEN_TITLE)));
title_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
title_label_->SetMultiLine(true);
CorrectLabelFontSize(title_label_);
« no previous file with comments | « chrome/browser/chromeos/login/password_changed_view.cc ('k') | chrome/browser/chromeos/login/update_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698