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

Unified Diff: chrome/browser/chromeos/login/eula_screen.cc

Issue 8588006: Eliminate CrosLibrary::EnsureLoaded (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 1 month 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
Index: chrome/browser/chromeos/login/eula_screen.cc
diff --git a/chrome/browser/chromeos/login/eula_screen.cc b/chrome/browser/chromeos/login/eula_screen.cc
index d33a39a8163e05c2b7c11a31d99d300f3b64cb48..f96d5cac7a8e8abd2b752f7ec07c4e2dfcbd3a5a 100644
--- a/chrome/browser/chromeos/login/eula_screen.cc
+++ b/chrome/browser/chromeos/login/eula_screen.cc
@@ -28,13 +28,8 @@ void EulaScreen::PrepareToShow() {
void EulaScreen::Show() {
// Command to own the TPM.
- if (chromeos::CrosLibrary::Get()->EnsureLoaded()) {
- chromeos::CrosLibrary::Get()->
- GetCryptohomeLibrary()->TpmCanAttemptOwnership();
- } else {
- LOG(ERROR) << "Cros library not loaded. "
- << "We must have disabled the link that led here.";
- }
+ chromeos::CrosLibrary::Get()->
+ GetCryptohomeLibrary()->TpmCanAttemptOwnership();
actor_->Show();
}
@@ -43,8 +38,7 @@ void EulaScreen::Hide() {
}
bool EulaScreen::IsTpmEnabled() const {
- return chromeos::CrosLibrary::Get()->EnsureLoaded() &&
- chromeos::CrosLibrary::Get()->GetCryptohomeLibrary()->TpmIsEnabled();
+ return chromeos::CrosLibrary::Get()->GetCryptohomeLibrary()->TpmIsEnabled();
}
GURL EulaScreen::GetOemEulaUrl() const {

Powered by Google App Engine
This is Rietveld 408576698