| OLD | NEW |
| 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/wizard_controller.h" | 5 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 6 | 6 |
| 7 #include <signal.h> | 7 #include <signal.h> |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 #include <stdlib.h> | 9 #include <stdlib.h> |
| 10 #include <sys/types.h> | 10 #include <sys/types.h> |
| (...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 324 } | 324 } |
| 325 // We need to reset the kOobeControllerDetected pref to allow the user to have | 325 // We need to reset the kOobeControllerDetected pref to allow the user to have |
| 326 // the choice to setup the device manually. The pref will be set properly if | 326 // the choice to setup the device manually. The pref will be set properly if |
| 327 // an eligible controller is detected later. | 327 // an eligible controller is detected later. |
| 328 SetControllerDetectedPref(false); | 328 SetControllerDetectedPref(false); |
| 329 | 329 |
| 330 // Show Material Design unless explicitly disabled or for an untested UX, | 330 // Show Material Design unless explicitly disabled or for an untested UX, |
| 331 // or when resuming an OOBE that had it disabled or unset. We use an if/else | 331 // or when resuming an OOBE that had it disabled or unset. We use an if/else |
| 332 // here to try and not set state when it is the default value so it can | 332 // here to try and not set state when it is the default value so it can |
| 333 // change and affect the OOBE again. | 333 // change and affect the OOBE again. |
| 334 if (!base::CommandLine::ForCurrentProcess()->HasSwitch( | 334 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 335 chromeos::switches::kEnableMdOobe)) | 335 chromeos::switches::kDisableMdOobe)) |
| 336 SetShowMdOobe(false); | 336 SetShowMdOobe(false); |
| 337 else if ((screen_pref.empty() || | 337 else if ((screen_pref.empty() || |
| 338 GetLocalState()->HasPrefPath(prefs::kOobeMdMode)) || | 338 GetLocalState()->HasPrefPath(prefs::kOobeMdMode)) || |
| 339 GetLocalState()->GetBoolean(prefs::kOobeMdMode)) | 339 GetLocalState()->GetBoolean(prefs::kOobeMdMode)) |
| 340 SetShowMdOobe(true); | 340 SetShowMdOobe(true); |
| 341 | 341 |
| 342 // TODO(drcrash): Remove this after testing (http://crbug.com/647411). | 342 // TODO(drcrash): Remove this after testing (http://crbug.com/647411). |
| 343 if (IsRemoraPairingOobe() || IsSharkRequisition() || IsRemoraRequisition()) { | 343 if (IsRemoraPairingOobe() || IsSharkRequisition() || IsRemoraRequisition()) { |
| 344 SetShowMdOobe(false); | 344 SetShowMdOobe(false); |
| 345 } | 345 } |
| (...skipping 1103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1449 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; | 1449 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; |
| 1450 } | 1450 } |
| 1451 | 1451 |
| 1452 EnrollmentScreen* screen = EnrollmentScreen::Get(this); | 1452 EnrollmentScreen* screen = EnrollmentScreen::Get(this); |
| 1453 screen->SetParameters(effective_config, shark_controller_.get()); | 1453 screen->SetParameters(effective_config, shark_controller_.get()); |
| 1454 SetStatusAreaVisible(true); | 1454 SetStatusAreaVisible(true); |
| 1455 SetCurrentScreen(screen); | 1455 SetCurrentScreen(screen); |
| 1456 } | 1456 } |
| 1457 | 1457 |
| 1458 } // namespace chromeos | 1458 } // namespace chromeos |
| OLD | NEW |