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

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

Issue 608283003: Remove retail mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
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/enrollment_screen.h" 5 #include "chrome/browser/chromeos/login/enrollment/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/callback.h" 9 #include "base/callback.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
12 #include "base/timer/elapsed_timer.h" 12 #include "base/timer/elapsed_timer.h"
13 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/browser_process_platform_part.h" 14 #include "chrome/browser/browser_process_platform_part.h"
15 #include "chrome/browser/chromeos/login/enrollment/enrollment_uma.h" 15 #include "chrome/browser/chromeos/login/enrollment/enrollment_uma.h"
16 #include "chrome/browser/chromeos/login/login_utils.h" 16 #include "chrome/browser/chromeos/login/login_utils.h"
17 #include "chrome/browser/chromeos/login/screen_manager.h" 17 #include "chrome/browser/chromeos/login/screen_manager.h"
18 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h" 18 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
19 #include "chrome/browser/chromeos/login/startup_utils.h" 19 #include "chrome/browser/chromeos/login/startup_utils.h"
20 #include "chrome/browser/chromeos/login/wizard_controller.h" 20 #include "chrome/browser/chromeos/login/wizard_controller.h"
21 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" 21 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h"
22 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 22 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
23 #include "chrome/browser/chromeos/profiles/profile_helper.h" 23 #include "chrome/browser/chromeos/profiles/profile_helper.h"
24 #include "chromeos/dbus/cryptohome_client.h" 24 #include "chromeos/dbus/cryptohome_client.h"
25 #include "chromeos/dbus/dbus_method_call_status.h" 25 #include "chromeos/dbus/dbus_method_call_status.h"
26 #include "chromeos/dbus/dbus_thread_manager.h" 26 #include "chromeos/dbus/dbus_thread_manager.h"
27 #include "chromeos/dbus/session_manager_client.h"
28 #include "components/pairing/controller_pairing_controller.h" 27 #include "components/pairing/controller_pairing_controller.h"
29 #include "google_apis/gaia/gaia_auth_util.h" 28 #include "google_apis/gaia/gaia_auth_util.h"
30 29
31 using namespace pairing_chromeos; 30 using namespace pairing_chromeos;
32 31
33 // Do not change the UMA histogram parameters without renaming the histograms! 32 // Do not change the UMA histogram parameters without renaming the histograms!
34 #define UMA_ENROLLMENT_TIME(histogram_name, elapsed_timer) \ 33 #define UMA_ENROLLMENT_TIME(histogram_name, elapsed_timer) \
35 do { \ 34 do { \
36 UMA_HISTOGRAM_CUSTOM_TIMES( \ 35 UMA_HISTOGRAM_CUSTOM_TIMES( \
37 (histogram_name), \ 36 (histogram_name), \
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 } 209 }
211 210
212 if (is_auto_enrollment()) 211 if (is_auto_enrollment())
213 policy::AutoEnrollmentClient::CancelAutoEnrollment(); 212 policy::AutoEnrollmentClient::CancelAutoEnrollment();
214 213
215 ClearAuth(base::Bind(&EnrollmentScreen::Finish, base::Unretained(this), 214 ClearAuth(base::Bind(&EnrollmentScreen::Finish, base::Unretained(this),
216 BaseScreenDelegate::ENTERPRISE_ENROLLMENT_COMPLETED)); 215 BaseScreenDelegate::ENTERPRISE_ENROLLMENT_COMPLETED));
217 } 216 }
218 217
219 void EnrollmentScreen::OnConfirmationClosed() { 218 void EnrollmentScreen::OnConfirmationClosed() {
220 // If the machine has been put in KIOSK mode we have to restart the session
221 // here to go in the proper KIOSK mode login screen.
222 policy::BrowserPolicyConnectorChromeOS* connector =
223 g_browser_process->platform_part()->browser_policy_connector_chromeos();
224 if (connector->GetDeviceMode() == policy::DEVICE_MODE_RETAIL_KIOSK) {
225 DBusThreadManager::Get()->GetSessionManagerClient()->StopSession();
226 return;
227 }
228
229 if (is_auto_enrollment() && 219 if (is_auto_enrollment() &&
230 !enrollment_failed_once_ && 220 !enrollment_failed_once_ &&
231 !user_.empty() && 221 !user_.empty() &&
232 LoginUtils::IsWhitelisted(user_, NULL)) { 222 LoginUtils::IsWhitelisted(user_, NULL)) {
233 actor_->ShowLoginSpinnerScreen(); 223 actor_->ShowLoginSpinnerScreen();
234 Finish(BaseScreenDelegate::ENTERPRISE_AUTO_MAGIC_ENROLLMENT_COMPLETED); 224 Finish(BaseScreenDelegate::ENTERPRISE_AUTO_MAGIC_ENROLLMENT_COMPLETED);
235 } else { 225 } else {
236 ClearAuth(base::Bind(&EnrollmentScreen::Finish, base::Unretained(this), 226 ClearAuth(base::Bind(&EnrollmentScreen::Finish, base::Unretained(this),
237 BaseScreenDelegate::ENTERPRISE_ENROLLMENT_COMPLETED)); 227 BaseScreenDelegate::ENTERPRISE_ENROLLMENT_COMPLETED));
238 } 228 }
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 enrollment_failed_once_ = true; 284 enrollment_failed_once_ = true;
295 if (elapsed_timer_) 285 if (elapsed_timer_)
296 UMA_ENROLLMENT_TIME(kMetricEnrollmentTimeFailure, elapsed_timer_); 286 UMA_ENROLLMENT_TIME(kMetricEnrollmentTimeFailure, elapsed_timer_);
297 if (remora_controller_) { 287 if (remora_controller_) {
298 remora_controller_->OnEnrollmentStatusChanged( 288 remora_controller_->OnEnrollmentStatusChanged(
299 HostPairingController::ENROLLMENT_STATUS_FAILURE); 289 HostPairingController::ENROLLMENT_STATUS_FAILURE);
300 } 290 }
301 } 291 }
302 292
303 } // namespace chromeos 293 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698