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

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 1826223003: cros: Skip OOBE update check for remora (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 } 600 }
601 } 601 }
602 602
603 void WizardController::OnEulaAccepted() { 603 void WizardController::OnEulaAccepted() {
604 time_eula_accepted_ = base::Time::Now(); 604 time_eula_accepted_ = base::Time::Now();
605 StartupUtils::MarkEulaAccepted(); 605 StartupUtils::MarkEulaAccepted();
606 InitiateMetricsReportingChange( 606 InitiateMetricsReportingChange(
607 usage_statistics_reporting_, 607 usage_statistics_reporting_,
608 base::Bind(&WizardController::InitiateMetricsReportingChangeCallback, 608 base::Bind(&WizardController::InitiateMetricsReportingChangeCallback,
609 weak_factory_.GetWeakPtr())); 609 weak_factory_.GetWeakPtr()));
610 PerformPostEulaActions();
610 611
611 if (skip_update_enroll_after_eula_) { 612 if (skip_update_enroll_after_eula_) {
612 PerformPostEulaActions();
613 ShowAutoEnrollmentCheckScreen(); 613 ShowAutoEnrollmentCheckScreen();
614 } else { 614 } else {
615 InitiateOOBEUpdate(); 615 InitiateOOBEUpdate();
616 } 616 }
617 } 617 }
618 618
619 void WizardController::InitiateMetricsReportingChangeCallback(bool enabled) { 619 void WizardController::InitiateMetricsReportingChangeCallback(bool enabled) {
620 CrosSettings::Get()->SetBoolean(kStatsReportingPref, enabled); 620 CrosSettings::Get()->SetBoolean(kStatsReportingPref, enabled);
621 if (!enabled) 621 if (!enabled)
622 return; 622 return;
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
763 } else if (skip_update_enroll_after_eula_ || 763 } else if (skip_update_enroll_after_eula_ ||
764 prescribed_enrollment_config_.should_enroll()) { 764 prescribed_enrollment_config_.should_enroll()) {
765 StartEnrollmentScreen(); 765 StartEnrollmentScreen();
766 } else { 766 } else {
767 PerformOOBECompletedActions(); 767 PerformOOBECompletedActions();
768 ShowLoginScreen(LoginScreenContext()); 768 ShowLoginScreen(LoginScreenContext());
769 } 769 }
770 } 770 }
771 771
772 void WizardController::InitiateOOBEUpdate() { 772 void WizardController::InitiateOOBEUpdate() {
773 if (IsRemoraRequisition()) {
774 VLOG(1) << "Skip OOBE Update for remora.";
775 OnUpdateCompleted();
776 return;
777 }
778
773 VLOG(1) << "InitiateOOBEUpdate"; 779 VLOG(1) << "InitiateOOBEUpdate";
774 PerformPostEulaActions();
775 SetCurrentScreenSmooth(GetScreen(kUpdateScreenName), true); 780 SetCurrentScreenSmooth(GetScreen(kUpdateScreenName), true);
776 UpdateScreen::Get(this)->StartNetworkCheck(); 781 UpdateScreen::Get(this)->StartNetworkCheck();
777 } 782 }
778 783
779 void WizardController::StartTimezoneResolve() { 784 void WizardController::StartTimezoneResolve() {
780 geolocation_provider_.reset(new SimpleGeolocationProvider( 785 geolocation_provider_.reset(new SimpleGeolocationProvider(
781 g_browser_process->system_request_context(), 786 g_browser_process->system_request_context(),
782 SimpleGeolocationProvider::DefaultGeolocationProviderURL())); 787 SimpleGeolocationProvider::DefaultGeolocationProviderURL()));
783 geolocation_provider_->RequestGeolocation( 788 geolocation_provider_->RequestGeolocation(
784 base::TimeDelta::FromSeconds(kResolveTimeZoneTimeoutSeconds), 789 base::TimeDelta::FromSeconds(kResolveTimeZoneTimeoutSeconds),
(...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after
1358 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; 1363 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT;
1359 } 1364 }
1360 1365
1361 EnrollmentScreen* screen = EnrollmentScreen::Get(this); 1366 EnrollmentScreen* screen = EnrollmentScreen::Get(this);
1362 screen->SetParameters(effective_config, shark_controller_.get()); 1367 screen->SetParameters(effective_config, shark_controller_.get());
1363 SetStatusAreaVisible(true); 1368 SetStatusAreaVisible(true);
1364 SetCurrentScreen(screen); 1369 SetCurrentScreen(screen);
1365 } 1370 }
1366 1371
1367 } // namespace chromeos 1372 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698