Skip to content

Commit

Permalink
[M106][OOBE]: Enable network portal detector after accepting EULA
Browse files Browse the repository at this point in the history
(cherry picked from commit d7a3d08)

Bug: b:239935283
Change-Id: I83798e4cc35fd072f907af3864c5afa3e382fd95
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3838817
Reviewed-by: Roman Sorokin <rsorokin@google.com>
Commit-Queue: Danila Kuzmin <dkuzmin@google.com>
Cr-Original-Commit-Position: refs/heads/main@{#1037159}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3845390
Reviewed-by: Renato Silva <rrsilva@google.com>
Cr-Commit-Position: refs/branch-heads/5249@{#38}
Cr-Branched-From: 4f7bea5-refs/heads/main@{#1036826}
  • Loading branch information
Danila Kuzmin authored and Chromium LUCI CQ committed Aug 23, 2022
1 parent 46b0026 commit fb2dfd7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
#include "chrome/common/url_constants.h"
#include "chrome/grit/chromium_strings.h"
#include "chrome/grit/generated_resources.h"
#include "chromeos/ash/components/network/portal_detector/network_portal_detector.h"
#include "components/consent_auditor/consent_auditor.h"
#include "components/metrics/metrics_service.h"
#include "components/prefs/pref_service.h"
Expand Down Expand Up @@ -406,6 +407,7 @@ void ConsolidatedConsentScreen::OnAccept(bool enable_stats_usage,

void ConsolidatedConsentScreen::ExitScreenWithAcceptedResult() {
StartupUtils::MarkEulaAccepted();
network_portal_detector::GetInstance()->Enable();

const DemoSetupController* const demo_setup_controller =
WizardController::default_controller()->demo_setup_controller();
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/ash/login/session/user_session_manager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,7 @@ bool MaybeShowNewTermsAfterUpdateToFlex(Profile* profile) {
bool is_device_managed = connector->IsDeviceEnterpriseManaged();
if (is_device_managed) {
StartupUtils::MarkEulaAccepted();
network_portal_detector::GetInstance()->Enable();
return false;
}
if (!IsRevenUpdatedToFlex())
Expand Down

0 comments on commit fb2dfd7

Please sign in to comment.