diff options
| author | glotov@chromium.org <glotov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-15 09:52:12 +0000 |
|---|---|---|
| committer | glotov@chromium.org <glotov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-15 09:52:12 +0000 |
| commit | 637fa5f14543b0e141c53c5fca82e2f0511a0904 (patch) | |
| tree | 8df7d214f5a3ffb1deb98392cec69c7413d8ea0d | |
| parent | b39ca52b56916a907667eb8092e88487ae4b977d (diff) | |
| download | chromium_src-637fa5f14543b0e141c53c5fca82e2f0511a0904.zip chromium_src-637fa5f14543b0e141c53c5fca82e2f0511a0904.tar.gz chromium_src-637fa5f14543b0e141c53c5fca82e2f0511a0904.tar.bz2 | |
Tooltip for 'System security setting' added if TPM is disabled
BUG=chromium-os:7256
TEST=Disable TPM in BIOS and re-ren OOBE. EULA screen should have 'System security setting' greyed out with tooltip.
Review URL: http://codereview.chromium.org/3829001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62718 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/login/eula_view.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/login/eula_view.cc b/chrome/browser/chromeos/login/eula_view.cc index b87bae9..c78d35d 100644 --- a/chrome/browser/chromeos/login/eula_view.cc +++ b/chrome/browser/chromeos/login/eula_view.cc @@ -305,7 +305,6 @@ void EulaView::Init() { if (!chromeos::CrosLibrary::Get()->EnsureLoaded() || !chromeos::CryptohomeTpmIsEnabled()) { system_security_settings_link_->SetEnabled(false); - // TODO(glotov): add tooltip with description. } layout->AddView(system_security_settings_link_); @@ -333,6 +332,12 @@ void EulaView::UpdateLocalizedStrings() { l10n_util::GetString(IDS_OPTION_DISABLED_BY_POLICY)); } + // Set tooltip for system security settings link if TPM is disabled. + if (!system_security_settings_link_->IsEnabled()) { + system_security_settings_link_->SetTooltipText( + l10n_util::GetString(IDS_EULA_TPM_DISABLED)); + } + // Load other labels from resources. usage_statistics_checkbox_->SetLabel( l10n_util::GetString(IDS_EULA_CHECKBOX_ENABLE_LOGGING)); |