| 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 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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::kDisableMdOobe)) | 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 // Disable md oobe by default in m57. |
| 343 SetShowMdOobe(false); |
| 344 |
| 342 // TODO(drcrash): Remove this after testing (http://crbug.com/647411). | 345 // TODO(drcrash): Remove this after testing (http://crbug.com/647411). |
| 343 if (IsRemoraPairingOobe() || IsSharkRequisition() || IsRemoraRequisition()) { | 346 if (IsRemoraPairingOobe() || IsSharkRequisition() || IsRemoraRequisition()) { |
| 344 SetShowMdOobe(false); | 347 SetShowMdOobe(false); |
| 345 } | 348 } |
| 346 | 349 |
| 347 AdvanceToScreen(first_screen_); | 350 AdvanceToScreen(first_screen_); |
| 348 if (!IsMachineHWIDCorrect() && !StartupUtils::IsDeviceRegistered() && | 351 if (!IsMachineHWIDCorrect() && !StartupUtils::IsDeviceRegistered() && |
| 349 first_screen_ == OobeScreen::SCREEN_UNKNOWN) | 352 first_screen_ == OobeScreen::SCREEN_UNKNOWN) |
| 350 ShowWrongHWIDScreen(); | 353 ShowWrongHWIDScreen(); |
| 351 } | 354 } |
| (...skipping 1140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1492 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; | 1495 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; |
| 1493 } | 1496 } |
| 1494 | 1497 |
| 1495 EnrollmentScreen* screen = EnrollmentScreen::Get(this); | 1498 EnrollmentScreen* screen = EnrollmentScreen::Get(this); |
| 1496 screen->SetParameters(effective_config, shark_controller_.get()); | 1499 screen->SetParameters(effective_config, shark_controller_.get()); |
| 1497 SetStatusAreaVisible(true); | 1500 SetStatusAreaVisible(true); |
| 1498 SetCurrentScreen(screen); | 1501 SetCurrentScreen(screen); |
| 1499 } | 1502 } |
| 1500 | 1503 |
| 1501 } // namespace chromeos | 1504 } // namespace chromeos |
| OLD | NEW |