Commit e1040299 authored by Patti's avatar Patti Committed by Commit Bot

Demo Mode: Enable suborganization enrollment for missing countries.

A bunch of countries were being enrolled into the root organisation
during the online demo mode setup flow when they should be enrolled
into their own suborganizations. Fix this for Belgium, Canada,
Ireland, Italy, Luxembourg, Spain, and the United Kingdom. The
corresponding organisational units and admins have been added
already.

Bug: 1039934
Change-Id: I4945eb89db95b95d1c10795390b04a14c74f36af
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2006900Reviewed-by: default avatarAga Wronska <agawronska@chromium.org>
Commit-Queue: Patti <patricialor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#734243}
parent 9d48f22b
......@@ -18,6 +18,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/chromeos/login/demo_mode/demo_resources.h"
#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.h"
#include "chrome/browser/chromeos/login/startup_utils.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
......@@ -462,7 +463,8 @@ std::string DemoSetupController::GetSubOrganizationEmail() {
const std::string country =
g_browser_process->local_state()->GetString(prefs::kDemoModeCountry);
const base::flat_set<std::string> kCountriesWithCustomization(
{"de", "dk", "fi", "fr", "jp", "nl", "no", "se"});
{"be", "ca", "de", "dk", "es", "fi", "fr", "gb", "ie", "it", "jp", "lu",
"nl", "no", "se"});
if (kCountriesWithCustomization.contains(country))
return "admin-" + country + "@" + policy::kDemoModeDomain;
return std::string();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment