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

Side by Side Diff: chrome/browser/chromeos/login/eula_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, 3 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/new_user_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/eula_view.h" 5 #include "chrome/browser/chromeos/login/eula_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 <string> 10 #include <string>
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 UTF16ToWide(l10n_util::GetStringUTF16(IDS_OPTION_DISABLED_BY_POLICY))); 375 UTF16ToWide(l10n_util::GetStringUTF16(IDS_OPTION_DISABLED_BY_POLICY)));
376 } 376 }
377 377
378 // Set tooltip for system security settings link if TPM is disabled. 378 // Set tooltip for system security settings link if TPM is disabled.
379 if (!system_security_settings_link_->IsEnabled()) { 379 if (!system_security_settings_link_->IsEnabled()) {
380 system_security_settings_link_->SetTooltipText( 380 system_security_settings_link_->SetTooltipText(
381 UTF16ToWide(l10n_util::GetStringUTF16(IDS_EULA_TPM_DISABLED))); 381 UTF16ToWide(l10n_util::GetStringUTF16(IDS_EULA_TPM_DISABLED)));
382 } 382 }
383 383
384 // Load other labels from resources. 384 // Load other labels from resources.
385 usage_statistics_checkbox_->SetLabel( 385 usage_statistics_checkbox_->SetText(
386 UTF16ToWide(l10n_util::GetStringUTF16(IDS_EULA_CHECKBOX_ENABLE_LOGGING))); 386 UTF16ToWide(l10n_util::GetStringUTF16(IDS_EULA_CHECKBOX_ENABLE_LOGGING)));
387 learn_more_link_->SetText( 387 learn_more_link_->SetText(
388 UTF16ToWide(l10n_util::GetStringUTF16(IDS_LEARN_MORE))); 388 UTF16ToWide(l10n_util::GetStringUTF16(IDS_LEARN_MORE)));
389 system_security_settings_link_->SetText( 389 system_security_settings_link_->SetText(
390 UTF16ToWide(l10n_util::GetStringUTF16(IDS_EULA_SYSTEM_SECURITY_SETTING))); 390 UTF16ToWide(l10n_util::GetStringUTF16(IDS_EULA_SYSTEM_SECURITY_SETTING)));
391 continue_button_->SetLabel(UTF16ToWide( 391 continue_button_->SetText(UTF16ToWide(
392 l10n_util::GetStringUTF16(IDS_EULA_ACCEPT_AND_CONTINUE_BUTTON))); 392 l10n_util::GetStringUTF16(IDS_EULA_ACCEPT_AND_CONTINUE_BUTTON)));
393 back_button_->SetLabel( 393 back_button_->SetText(
394 UTF16ToWide(l10n_util::GetStringUTF16(IDS_EULA_BACK_BUTTON))); 394 UTF16ToWide(l10n_util::GetStringUTF16(IDS_EULA_BACK_BUTTON)));
395 } 395 }
396 396
397 bool EulaView::IsUsageStatsChecked() const { 397 bool EulaView::IsUsageStatsChecked() const {
398 return usage_statistics_checkbox_ && usage_statistics_checkbox_->checked(); 398 return usage_statistics_checkbox_ && usage_statistics_checkbox_->checked();
399 } 399 }
400 400
401 void EulaView::ShowTpmPassword(const std::string& tpm_password) { 401 void EulaView::ShowTpmPassword(const std::string& tpm_password) {
402 if (tpm_info_view_) 402 if (tpm_info_view_)
403 tpm_info_view_->ShowTpmPassword(tpm_password); 403 tpm_info_view_->ShowTpmPassword(tpm_password);
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
518 } 518 }
519 519
520 bool EulaView::FadeInOnShow() { 520 bool EulaView::FadeInOnShow() {
521 return false; 521 return false;
522 } 522 }
523 523
524 void EulaView::OnLinkActivated(size_t index) { 524 void EulaView::OnLinkActivated(size_t index) {
525 } 525 }
526 526
527 } // namespace chromeos 527 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/new_user_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698