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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/views/login_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/ui/views/location_bar/selected_keyword_view.cc ('k') | chrome/browser/ui/views/notifications/balloon_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/login_view.cc
===================================================================
--- chrome/browser/ui/views/login_view.cc (revision 104083)
+++ chrome/browser/ui/views/login_view.cc (working copy)
@@ -28,10 +28,10 @@
LoginView::LoginView(const std::wstring& explanation, LoginModel* model)
: username_field_(new views::Textfield),
password_field_(new views::Textfield(views::Textfield::STYLE_PASSWORD)),
- username_label_(new views::Label(
- l10n_util::GetStringUTF16(IDS_LOGIN_DIALOG_USERNAME_FIELD))),
- password_label_(new views::Label(
- l10n_util::GetStringUTF16(IDS_LOGIN_DIALOG_PASSWORD_FIELD))),
+ username_label_(new views::Label(UTF16ToWide(
+ l10n_util::GetStringUTF16(IDS_LOGIN_DIALOG_USERNAME_FIELD)))),
+ password_label_(new views::Label(UTF16ToWide(
+ l10n_util::GetStringUTF16(IDS_LOGIN_DIALOG_PASSWORD_FIELD)))),
message_label_(new views::Label(explanation)),
login_model_(model) {
message_label_->SetMultiLine(true);
« no previous file with comments | « chrome/browser/ui/views/location_bar/selected_keyword_view.cc ('k') | chrome/browser/ui/views/notifications/balloon_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698