diff options
| author | Mattias Nissler <mnissler@chromium.org> | 2015-07-08 21:07:46 +0200 |
|---|---|---|
| committer | Mattias Nissler <mnissler@chromium.org> | 2015-07-08 19:09:07 +0000 |
| commit | 34713a8f642246f6aba92eb1ce76218a9763e4e2 (patch) | |
| tree | 3c222369ae48a6486215bb8930676d9175c94795 | |
| parent | a614b971d0005897a9aee4025d7600396a16a43a (diff) | |
| download | chromium_src-34713a8f642246f6aba92eb1ce76218a9763e4e2.zip chromium_src-34713a8f642246f6aba92eb1ce76218a9763e4e2.tar.gz chromium_src-34713a8f642246f6aba92eb1ce76218a9763e4e2.tar.bz2 | |
Marked the enrollment screen completed if AIDE permission is granted.
BUG=502356
Review URL: https://codereview.chromium.org/1196223010
Cr-Commit-Position: refs/heads/master@{#336342}
(cherry picked from commit aa9eebf8777f5a9f787dcb4c715d8dc6c831d8c7)
Review URL: https://codereview.chromium.org/1220043013 .
Cr-Commit-Position: refs/branch-heads/2403@{#477}
Cr-Branched-From: f54b8097a9c45ed4ad308133d49f05325d6c5070-refs/heads/master@{#330231}
| -rw-r--r-- | chrome/browser/chromeos/login/enrollment/enrollment_screen.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc b/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc index ab68d2a..f561144 100644 --- a/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc +++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc @@ -290,7 +290,6 @@ void EnrollmentScreen::SendEnrollmentAuthToken(const std::string& token) { } void EnrollmentScreen::ShowEnrollmentStatusOnSuccess() { - StartupUtils::MarkOobeCompleted(); if (elapsed_timer_) UMA_ENROLLMENT_TIME(kMetricEnrollmentTimeSuccess, elapsed_timer_); actor_->ShowEnrollmentStatus(policy::EnrollmentStatus::ForStatus( diff --git a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.cc b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.cc index 931c9bb..59f2512 100644 --- a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.cc +++ b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.cc @@ -12,6 +12,7 @@ #include "chrome/browser/browser_process_platform_part.h" #include "chrome/browser/browsing_data/browsing_data_helper.h" #include "chrome/browser/chromeos/login/enrollment/enrollment_uma.h" +#include "chrome/browser/chromeos/login/startup_utils.h" #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h" #include "chrome/browser/chromeos/policy/enrollment_status_chromeos.h" @@ -252,6 +253,7 @@ void EnterpriseEnrollmentHelperImpl::OnEnrollmentFinished( if (status.status() == policy::EnrollmentStatus::STATUS_SUCCESS) { success_ = true; DCHECK(!fetch_additional_token_ || !additional_token_.empty()); + StartupUtils::MarkOobeCompleted(); status_consumer()->OnDeviceEnrolled(additional_token_); } else { status_consumer()->OnEnrollmentError(status); |