[Oidc Enrollment] Correct OIDC unified consent dialog text
Some text on the unified consent dialog has been updated in newest UX
design. Updating the implementation to match.
Updated screenshot: https://screenshot.googleplex.com/6pag6LxK9q3PQaj
Bug: 335637719
Change-Id: Iaf02363f555dc0aaa0fbc5793428391e0f67405d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5588885
Reviewed-by: Alex Ilin <alexilin@chromium.org>
Reviewed-by: Yann Dago <ydago@chromium.org>
Commit-Queue: Zonghan Xu <xzonghan@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1310106}
diff --git a/chrome/app/profiles_strings.grdp b/chrome/app/profiles_strings.grdp
index 103232c..7450db7 100644
--- a/chrome/app/profiles_strings.grdp
+++ b/chrome/app/profiles_strings.grdp
@@ -583,6 +583,9 @@
<message name="IDS_ENTERPRISE_PROFILE_WELCOME_PROFILE_SEPARATION_DEVICE_MANAGED" desc="Subtitle of the enterprise profile welcome screen for a signin interception, informing that the device is managed by an administrator that requires a new profile for managed accounts.">
This device is managed. A new profile is required for account <ph name="USER_EMAIL_ADDRESS">$1<ex>john.doe@example.com</ex></ph> by your device administrator
</message>
+ <message name="IDS_ENTERPRISE_PROFILE_WELCOME_PROFILE_SEPARATION_ACCOUNT_MANAGED" desc="Subtitle of the enterprise profile welcome screen for a signin interception, informing that the device is managed by an administrator that requires a new profile for managed accounts.">
+ Your organization manages your account
+ </message>
<message name="IDS_ENTERPRISE_PROFILE_WELCOME_PROFILE_SEPARATION_DEVICE_MANAGED_BY" desc="Subtitle of the enterprise profile welcome screen for a signin interception, informing that the device is managed by an administrator that requires a new profile for managed accounts.">
This device is managed by <ph name="DEVICE_MANAGER">$1<ex>example.com</ex></ph>. A new profile is required for account <ph name="USER_EMAIL_ADDRESS">$2<ex>john.doe@example.com</ex></ph> by <ph name="DEVICE_MANAGER">$1<ex>example.com</ex></ph>
</message>
@@ -604,6 +607,9 @@
<message name="IDS_ENTERPRISE_WELCOME_PROFILE_REQUIRED_TITLE" desc="Title of the enterprise profile welcome screen when a profile is required. It is shown after a user signs into a managed account outside of the profile creation flow.">
Your organization requires a profile
</message>
+ <message name="IDS_ENTERPRISE_WELCOME_PROFILE_SETUP_TITLE" desc="Title of the enterprise profile welcome screen when a profile is required. It is shown after a user signs into a managed account outside of the profile creation flow.">
+ Set up your work profile
+ </message>
<message name="IDS_ENTERPRISE_WELCOME_PROFILE_WILL_BE_MANAGED_TITLE" desc="Title of the enterprise profile welcome screen when a managed profile will be created. It is shown after a user signs into a managed account outside of the profile creation flow.">
Your organization will manage this profile
</message>
diff --git a/chrome/app/profiles_strings_grdp/IDS_ENTERPRISE_PROFILE_WELCOME_PROFILE_SEPARATION_ACCOUNT_MANAGED.png.sha1 b/chrome/app/profiles_strings_grdp/IDS_ENTERPRISE_PROFILE_WELCOME_PROFILE_SEPARATION_ACCOUNT_MANAGED.png.sha1
new file mode 100644
index 0000000..b6c42bd3
--- /dev/null
+++ b/chrome/app/profiles_strings_grdp/IDS_ENTERPRISE_PROFILE_WELCOME_PROFILE_SEPARATION_ACCOUNT_MANAGED.png.sha1
@@ -0,0 +1 @@
+381b6ab829d08c2d6574bd2715e0acdbfdcbf3d0
\ No newline at end of file
diff --git a/chrome/app/profiles_strings_grdp/IDS_ENTERPRISE_WELCOME_PROFILE_SETUP_TITLE.png.sha1 b/chrome/app/profiles_strings_grdp/IDS_ENTERPRISE_WELCOME_PROFILE_SETUP_TITLE.png.sha1
new file mode 100644
index 0000000..a550897
--- /dev/null
+++ b/chrome/app/profiles_strings_grdp/IDS_ENTERPRISE_WELCOME_PROFILE_SETUP_TITLE.png.sha1
@@ -0,0 +1 @@
+6adbdc14317bf08b8598e437aa2c0b2271ecc51c
\ No newline at end of file
diff --git a/chrome/browser/ui/webui/signin/managed_user_profile_notice_handler.cc b/chrome/browser/ui/webui/signin/managed_user_profile_notice_handler.cc
index fe6d0c37..c6ab7f64 100644
--- a/chrome/browser/ui/webui/signin/managed_user_profile_notice_handler.cc
+++ b/chrome/browser/ui/webui/signin/managed_user_profile_notice_handler.cc
@@ -312,12 +312,11 @@
dict.Set("proceedLabel", l10n_util::GetStringUTF8(IDS_DONE));
break;
case ManagedUserProfileNoticeUI::ScreenType::kEnterpriseOIDC:
- title = l10n_util::GetStringUTF8(
- IDS_ENTERPRISE_WELCOME_PROFILE_REQUIRED_TITLE);
+ title =
+ l10n_util::GetStringUTF8(IDS_ENTERPRISE_WELCOME_PROFILE_SETUP_TITLE);
dict.Set("showEnterpriseBadge", true);
- subtitle = l10n_util::GetStringFUTF8(
- IDS_ENTERPRISE_PROFILE_WELCOME_PROFILE_SEPARATION_DEVICE_MANAGED,
- email_);
+ subtitle = l10n_util::GetStringUTF8(
+ IDS_ENTERPRISE_PROFILE_WELCOME_PROFILE_SEPARATION_ACCOUNT_MANAGED);
enterprise_info = l10n_util::GetStringUTF8(
IDS_ENTERPRISE_PROFILE_WELCOME_MANAGED_DESCRIPTION_WITH_SYNC);
dict.Set("proceedLabel",
diff --git a/chrome/browser/ui/webui/signin/managed_user_profile_notice_ui.cc b/chrome/browser/ui/webui/signin/managed_user_profile_notice_ui.cc
index fef1bc7..b614f5f9 100644
--- a/chrome/browser/ui/webui/signin/managed_user_profile_notice_ui.cc
+++ b/chrome/browser/ui/webui/signin/managed_user_profile_notice_ui.cc
@@ -124,9 +124,9 @@
update_data.Set("showLinkDataCheckbox", show_link_data_option);
} else if (type == ManagedUserProfileNoticeUI::ScreenType::kEnterpriseOIDC) {
update_data.Set("isModalDialog", true);
- update_data.Set("enterpriseProfileWelcomeTitle",
- l10n_util::GetStringUTF16(
- IDS_ENTERPRISE_WELCOME_PROFILE_REQUIRED_TITLE));
+ update_data.Set(
+ "enterpriseProfileWelcomeTitle",
+ l10n_util::GetStringUTF16(IDS_ENTERPRISE_WELCOME_PROFILE_SETUP_TITLE));
update_data.Set("showLinkDataCheckbox", false);
#if !BUILDFLAG(IS_CHROMEOS)