summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxiyuan <xiyuan@chromium.org>2016-03-24 15:28:40 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-24 22:29:54 +0000
commit52a2bcfb1a86f2980f2ea794857ed2b2364381ac (patch)
tree9f8722b0d2e38072b90c933a685aab77029e25d1
parent6c260f8ac6796357d31be90f3a713bb24a21acb4 (diff)
downloadchromium_src-52a2bcfb1a86f2980f2ea794857ed2b2364381ac.zip
chromium_src-52a2bcfb1a86f2980f2ea794857ed2b2364381ac.tar.gz
chromium_src-52a2bcfb1a86f2980f2ea794857ed2b2364381ac.tar.bz2
cros: Skip OOBE update check for remora
Skip OOBE AU for remora to let the controller app takes control of update when it is available. BUG=583398 Review URL: https://codereview.chromium.org/1826223003 Cr-Commit-Position: refs/heads/master@{#383165}
-rw-r--r--chrome/browser/chromeos/login/wizard_controller.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index 2e6b799..832c296 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -607,9 +607,9 @@ void WizardController::OnEulaAccepted() {
usage_statistics_reporting_,
base::Bind(&WizardController::InitiateMetricsReportingChangeCallback,
weak_factory_.GetWeakPtr()));
+ PerformPostEulaActions();
if (skip_update_enroll_after_eula_) {
- PerformPostEulaActions();
ShowAutoEnrollmentCheckScreen();
} else {
InitiateOOBEUpdate();
@@ -770,8 +770,13 @@ void WizardController::OnDeviceDisabledChecked(bool device_disabled) {
}
void WizardController::InitiateOOBEUpdate() {
+ if (IsRemoraRequisition()) {
+ VLOG(1) << "Skip OOBE Update for remora.";
+ OnUpdateCompleted();
+ return;
+ }
+
VLOG(1) << "InitiateOOBEUpdate";
- PerformPostEulaActions();
SetCurrentScreenSmooth(GetScreen(kUpdateScreenName), true);
UpdateScreen::Get(this)->StartNetworkCheck();
}