EnrollmentScreen source code cosmetics.

chrome/browser/chromeos/login/enrollment/enrollment_screen.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 109 matching lines @@
       LOG(WARNING) << "Network error " << error.state();
       return;
     case GoogleServiceAuthError::NUM_STATES:
       break;
   }
 
   NOTREACHED();
   UMAFailure(policy::kMetricEnrollmentOtherFailed);
 }
 
-void EnrollmentScreen::OnOAuthTokenAvailable(
-    const std::string& token) {
+void EnrollmentScreen::OnOAuthTokenAvailable(const std::string& token) {
   RegisterForDevicePolicy(token);
 }
 
 void EnrollmentScreen::OnRetry() {
   actor_->ResetAuth(base::Bind(&EnrollmentScreen::ShowSigninScreen,
                                weak_ptr_factory_.GetWeakPtr()));
 }
 
 void EnrollmentScreen::OnCancel() {
   if (enrollment_mode_ == EnrollmentScreenActor::ENROLLMENT_MODE_FORCED ||
@@ skipping 33 matching lines @@
     get_screen_observer()->OnExit(
         ScreenObserver::ENTERPRISE_AUTO_MAGIC_ENROLLMENT_COMPLETED);
   } else {
     actor_->ResetAuth(
         base::Bind(&ScreenObserver::OnExit,
                    base::Unretained(get_screen_observer()),
                    ScreenObserver::ENTERPRISE_ENROLLMENT_COMPLETED));
   }
 }
 
-void EnrollmentScreen::RegisterForDevicePolicy(
-    const std::string& token) {
+void EnrollmentScreen::RegisterForDevicePolicy(const std::string& token) {
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   if (connector->IsEnterpriseManaged() &&
       connector->GetEnterpriseDomain() != gaia::ExtractDomainName(user_)) {
     LOG(ERROR) << "Trying to re-enroll to a different domain than "
                << connector->GetEnterpriseDomain();
     UMAFailure(policy::kMetricEnrollmentWrongUserError);
     actor_->ShowUIError(
         EnrollmentScreenActor::UI_ERROR_DOMAIN_MISMATCH);
     return;
@@ skipping 14 matching lines @@
       base::Bind(&EnrollmentScreen::ReportEnrollmentStatus,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void EnrollmentScreen::ShowEnrollmentStatusOnSuccess(
     const policy::EnrollmentStatus& status) {
   actor_->ShowEnrollmentStatus(status);
   StartupUtils::MarkOobeCompleted();
 }
 
-void EnrollmentScreen::ReportEnrollmentStatus(
-    policy::EnrollmentStatus status) {
-  bool success = status.status() == policy::EnrollmentStatus::STATUS_SUCCESS;
-  enrollment_failed_once_ |= !success;
+void EnrollmentScreen::ReportEnrollmentStatus(policy::EnrollmentStatus status) {
   if (status.status() == policy::EnrollmentStatus::STATUS_SUCCESS) {
     StartupUtils::MarkDeviceRegistered(
         base::Bind(&EnrollmentScreen::ShowEnrollmentStatusOnSuccess,
                    weak_ptr_factory_.GetWeakPtr(),
                    status));
     UMA(is_auto_enrollment() ? policy::kMetricEnrollmentAutoOK
                              : policy::kMetricEnrollmentOK);
     return;
+  } else {
+    enrollment_failed_once_ = true;
   }
   actor_->ShowEnrollmentStatus(status);
 
   switch (status.status()) {
     case policy::EnrollmentStatus::STATUS_REGISTRATION_FAILED:
     case policy::EnrollmentStatus::STATUS_POLICY_FETCH_FAILED:
       switch (status.client_status()) {
         case policy::DM_STATUS_SUCCESS:
         case policy::DM_STATUS_REQUEST_INVALID:
         case policy::DM_STATUS_SERVICE_DEVICE_NOT_FOUND:
@@ skipping 74 matching lines @@
     sample = policy::kMetricEnrollmentAutoFailed;
   UMA(sample);
 }
 
 void EnrollmentScreen::ShowSigninScreen() {
   actor_->Show();
   actor_->ShowSigninScreen();
 }
 
 }  // namespace chromeos