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

Side by Side Diff: chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc

Issue 14362031: Move part of WizardController static code to StartupUtils (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fighting with whitespaces again Created 7 years, 8 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/enrollment/enterprise_enrollment_screen. h" 5 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen. h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
11 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
12 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/chromeos/login/login_utils.h" 13 #include "chrome/browser/chromeos/login/login_utils.h"
14 #include "chrome/browser/chromeos/login/screens/screen_observer.h" 14 #include "chrome/browser/chromeos/login/screens/screen_observer.h"
15 #include "chrome/browser/chromeos/login/startup_utils.h"
15 #include "chrome/browser/chromeos/login/wizard_controller.h" 16 #include "chrome/browser/chromeos/login/wizard_controller.h"
16 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" 17 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h"
17 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 18 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
18 #include "chrome/browser/policy/browser_policy_connector.h" 19 #include "chrome/browser/policy/browser_policy_connector.h"
19 #include "chrome/browser/policy/cloud/enterprise_metrics.h" 20 #include "chrome/browser/policy/cloud/enterprise_metrics.h"
20 #include "chromeos/dbus/cryptohome_client.h" 21 #include "chromeos/dbus/cryptohome_client.h"
21 #include "chromeos/dbus/dbus_thread_manager.h" 22 #include "chromeos/dbus/dbus_thread_manager.h"
22 #include "chromeos/dbus/session_manager_client.h" 23 #include "chromeos/dbus/session_manager_client.h"
23 #include "google_apis/gaia/gaia_auth_util.h" 24 #include "google_apis/gaia/gaia_auth_util.h"
24 #include "google_apis/gaia/google_service_auth_error.h" 25 #include "google_apis/gaia/google_service_auth_error.h"
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 215
215 void EnterpriseEnrollmentScreen::ReportEnrollmentStatus( 216 void EnterpriseEnrollmentScreen::ReportEnrollmentStatus(
216 policy::EnrollmentStatus status) { 217 policy::EnrollmentStatus status) {
217 bool success = status.status() == policy::EnrollmentStatus::STATUS_SUCCESS; 218 bool success = status.status() == policy::EnrollmentStatus::STATUS_SUCCESS;
218 enrollment_failed_once_ |= !success; 219 enrollment_failed_once_ |= !success;
219 actor_->ShowEnrollmentStatus(status); 220 actor_->ShowEnrollmentStatus(status);
220 NotifyTestingObservers(success); 221 NotifyTestingObservers(success);
221 222
222 switch (status.status()) { 223 switch (status.status()) {
223 case policy::EnrollmentStatus::STATUS_SUCCESS: 224 case policy::EnrollmentStatus::STATUS_SUCCESS:
224 WizardController::MarkDeviceRegistered(); 225 StartupUtils::MarkDeviceRegistered();
225 UMA(is_auto_enrollment_ ? policy::kMetricEnrollmentAutoOK 226 UMA(is_auto_enrollment_ ? policy::kMetricEnrollmentAutoOK
226 : policy::kMetricEnrollmentOK); 227 : policy::kMetricEnrollmentOK);
227 return; 228 return;
228 case policy::EnrollmentStatus::STATUS_REGISTRATION_FAILED: 229 case policy::EnrollmentStatus::STATUS_REGISTRATION_FAILED:
229 case policy::EnrollmentStatus::STATUS_POLICY_FETCH_FAILED: 230 case policy::EnrollmentStatus::STATUS_POLICY_FETCH_FAILED:
230 switch (status.client_status()) { 231 switch (status.client_status()) {
231 case policy::DM_STATUS_SUCCESS: 232 case policy::DM_STATUS_SUCCESS:
232 case policy::DM_STATUS_REQUEST_INVALID: 233 case policy::DM_STATUS_REQUEST_INVALID:
233 case policy::DM_STATUS_SERVICE_DEVICE_NOT_FOUND: 234 case policy::DM_STATUS_SERVICE_DEVICE_NOT_FOUND:
234 case policy::DM_STATUS_SERVICE_MANAGEMENT_TOKEN_INVALID: 235 case policy::DM_STATUS_SERVICE_MANAGEMENT_TOKEN_INVALID:
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 actor_->Show(); 285 actor_->Show();
285 actor_->ShowSigninScreen(); 286 actor_->ShowSigninScreen();
286 } 287 }
287 288
288 void EnterpriseEnrollmentScreen::NotifyTestingObservers(bool succeeded) { 289 void EnterpriseEnrollmentScreen::NotifyTestingObservers(bool succeeded) {
289 FOR_EACH_OBSERVER(TestingObserver, observers_, 290 FOR_EACH_OBSERVER(TestingObserver, observers_,
290 OnEnrollmentComplete(succeeded)); 291 OnEnrollmentComplete(succeeded));
291 } 292 }
292 293
293 } // namespace chromeos 294 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/extensions/info_private_api.cc ('k') | chrome/browser/chromeos/login/existing_user_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698