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

Side by Side Diff: chrome/browser/chromeos/login/new_user_view.cc

Issue 5990008: Remove wstring from l10n_util. Part 1.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 12 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/new_user_view.h" 5 #include "chrome/browser/chromeos/login/new_user_view.h"
6 6
7 #include <signal.h> 7 #include <signal.h>
8 #include <sys/types.h> 8 #include <sys/types.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 sign_in_button_->SetLabel(l10n_util::GetString(IDS_LOGIN_BUTTON)); 280 sign_in_button_->SetLabel(l10n_util::GetString(IDS_LOGIN_BUTTON));
281 if (need_create_account_) { 281 if (need_create_account_) {
282 create_account_link_->SetText( 282 create_account_link_->SetText(
283 l10n_util::GetString(IDS_CREATE_ACCOUNT_BUTTON)); 283 l10n_util::GetString(IDS_CREATE_ACCOUNT_BUTTON));
284 } 284 }
285 if (need_guest_link_) { 285 if (need_guest_link_) {
286 guest_link_->SetText( 286 guest_link_->SetText(
287 l10n_util::GetString(IDS_BROWSE_WITHOUT_SIGNING_IN_BUTTON)); 287 l10n_util::GetString(IDS_BROWSE_WITHOUT_SIGNING_IN_BUTTON));
288 } 288 }
289 delegate_->ClearErrors(); 289 delegate_->ClearErrors();
290 languages_menubutton_->SetText(language_switch_menu_.GetCurrentLocaleName()); 290 languages_menubutton_->SetText(
291 UTF16ToWide(language_switch_menu_.GetCurrentLocaleName()));
291 } 292 }
292 293
293 void NewUserView::OnLocaleChanged() { 294 void NewUserView::OnLocaleChanged() {
294 RecreatePeculiarControls(); 295 RecreatePeculiarControls();
295 UpdateLocalizedStrings(); 296 UpdateLocalizedStrings();
296 AddChildView(sign_in_button_); 297 AddChildView(sign_in_button_);
297 AddChildView(languages_menubutton_); 298 AddChildView(languages_menubutton_);
298 299
299 Layout(); 300 Layout();
300 SchedulePaint(); 301 SchedulePaint();
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 562
562 void NewUserView::InitLink(views::Link** link) { 563 void NewUserView::InitLink(views::Link** link) {
563 *link = new views::Link(std::wstring()); 564 *link = new views::Link(std::wstring());
564 (*link)->SetController(this); 565 (*link)->SetController(this);
565 (*link)->SetNormalColor(login::kLinkColor); 566 (*link)->SetNormalColor(login::kLinkColor);
566 (*link)->SetHighlightedColor(login::kLinkColor); 567 (*link)->SetHighlightedColor(login::kLinkColor);
567 AddChildView(*link); 568 AddChildView(*link);
568 } 569 }
569 570
570 } // namespace chromeos 571 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698