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

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

Issue 7717028: views: Remove NativeTextButton::SetLabel() and replace all call sites with SetText(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: also removes label() Created 9 years, 4 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 l10n_util::GetStringUTF16(IDS_LOGIN_TITLE))); 293 l10n_util::GetStringUTF16(IDS_LOGIN_TITLE)));
294 title_hint_label_->SetFont(title_hint_font); 294 title_hint_label_->SetFont(title_hint_font);
295 title_hint_label_->SetText(UTF16ToWide( 295 title_hint_label_->SetText(UTF16ToWide(
296 l10n_util::GetStringUTF16(IDS_LOGIN_TITLE_HINT))); 296 l10n_util::GetStringUTF16(IDS_LOGIN_TITLE_HINT)));
297 SetAndCorrectTextfieldFont(username_field_, base_font); 297 SetAndCorrectTextfieldFont(username_field_, base_font);
298 username_field_->set_text_to_display_when_empty( 298 username_field_->set_text_to_display_when_empty(
299 l10n_util::GetStringUTF16(IDS_LOGIN_USERNAME)); 299 l10n_util::GetStringUTF16(IDS_LOGIN_USERNAME));
300 SetAndCorrectTextfieldFont(password_field_, base_font); 300 SetAndCorrectTextfieldFont(password_field_, base_font);
301 password_field_->set_text_to_display_when_empty( 301 password_field_->set_text_to_display_when_empty(
302 l10n_util::GetStringUTF16(IDS_LOGIN_PASSWORD)); 302 l10n_util::GetStringUTF16(IDS_LOGIN_PASSWORD));
303 sign_in_button_->SetLabel(UTF16ToWide( 303 sign_in_button_->SetText(UTF16ToWide(
304 l10n_util::GetStringUTF16(IDS_LOGIN_BUTTON))); 304 l10n_util::GetStringUTF16(IDS_LOGIN_BUTTON)));
305 if (need_guest_link_) { 305 if (need_guest_link_) {
306 guest_link_->SetFont(base_font); 306 guest_link_->SetFont(base_font);
307 guest_link_->SetText(UTF16ToWide( 307 guest_link_->SetText(UTF16ToWide(
308 l10n_util::GetStringUTF16(IDS_BROWSE_WITHOUT_SIGNING_IN_BUTTON))); 308 l10n_util::GetStringUTF16(IDS_BROWSE_WITHOUT_SIGNING_IN_BUTTON)));
309 } 309 }
310 if (need_create_account_) { 310 if (need_create_account_) {
311 create_account_link_->SetFont(base_font); 311 create_account_link_->SetFont(base_font);
312 create_account_link_->SetText( 312 create_account_link_->SetText(
313 UTF16ToWide(l10n_util::GetStringUTF16(IDS_CREATE_ACCOUNT_BUTTON))); 313 UTF16ToWide(l10n_util::GetStringUTF16(IDS_CREATE_ACCOUNT_BUTTON)));
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
572 572
573 void NewUserView::InitLink(views::Link** link) { 573 void NewUserView::InitLink(views::Link** link) {
574 *link = new views::Link(std::wstring()); 574 *link = new views::Link(std::wstring());
575 (*link)->set_listener(this); 575 (*link)->set_listener(this);
576 (*link)->SetNormalColor(login::kLinkColor); 576 (*link)->SetNormalColor(login::kLinkColor);
577 (*link)->SetHighlightedColor(login::kLinkColor); 577 (*link)->SetHighlightedColor(login::kLinkColor);
578 AddChildView(*link); 578 AddChildView(*link);
579 } 579 }
580 580
581 } // namespace chromeos 581 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/eula_view.cc ('k') | chrome/browser/ui/views/first_run_search_engine_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698