Commit 87c6a94a authored by Aga Wronska's avatar Aga Wronska Committed by Commit Bot

Remove unused strings from EDU coexistence setup flow

The strings were removed from the web UI in a previous changelist
that needed to be merged to M84 and could not touch strings file.
This is the cleanup.

Bug: 1097371
Test: Manually
Change-Id: I7d515b1441b143215f351e4fa4aed294d7ab8efb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2261896Reviewed-by: default avatarYilkal Abe <yilkal@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Aga Wronska <agawronska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#781976}
parent 6664aed3
...@@ -5228,6 +5228,13 @@ ...@@ -5228,6 +5228,13 @@
<message name="IDS_EDU_LOGIN_PARENT_SIGNIN_PASSWORD_HIDE" desc="A tool tip on a button that hides the saved password that is being shown."> <message name="IDS_EDU_LOGIN_PARENT_SIGNIN_PASSWORD_HIDE" desc="A tool tip on a button that hides the saved password that is being shown.">
Hide password Hide password
</message> </message>
<!--
==================================================================================
If you change any IDS_EDU_LOGIN_INFO_* string, update kConsentScreenTextVersion in
chrome/browser/chromeos/child_accounts/secondary_account_consent_logger.cc
to the value of "v<GERRIT_CL_NUMBER>"
-->
<message name="IDS_EDU_LOGIN_INFO_COEXISTENCE_TITLE" desc="Title for the screen explaining co-existence to a parent."> <message name="IDS_EDU_LOGIN_INFO_COEXISTENCE_TITLE" desc="Title for the screen explaining co-existence to a parent.">
School account information for parents School account information for parents
</message> </message>
...@@ -5236,13 +5243,6 @@ ...@@ -5236,13 +5243,6 @@
If your child uses a Chromebook in school and you wish to mirror the school experience at home to ensure your child has access to all necessary schoolwork, please sign out of this Family Link account and sign in to the school account from the Chrome OS accounts page (note: Family Link parental controls will not apply).&lt;br&gt;&lt;br&gt; If your child uses a Chromebook in school and you wish to mirror the school experience at home to ensure your child has access to all necessary schoolwork, please sign out of this Family Link account and sign in to the school account from the Chrome OS accounts page (note: Family Link parental controls will not apply).&lt;br&gt;&lt;br&gt;
If your child does not use a Chromebook in school or if you prefer to manage your child’s experience at home using Family Link, please click the Next button below to add a school account to this profile. If your child does not use a Chromebook in school or if you prefer to manage your child’s experience at home using Family Link, please click the Next button below to add a school account to this profile.
</message> </message>
<!--
==================================================================================
If you change any IDS_EDU_LOGIN_INFO_* string, update kConsentScreenTextVersion in
chrome/browser/chromeos/child_accounts/secondary_account_consent_logger.cc
to the value of "v<GERRIT_CL_NUMBER>"
-->
<message name="IDS_EDU_LOGIN_INFO_TITLE" desc="Title for the parent information screen in EDU account addition flow."> <message name="IDS_EDU_LOGIN_INFO_TITLE" desc="Title for the parent information screen in EDU account addition flow.">
G Suite for Education accounts G Suite for Education accounts
</message> </message>
...@@ -5252,23 +5252,6 @@ ...@@ -5252,23 +5252,6 @@
<message name="IDS_EDU_LOGIN_INFO_PARENT_SETTINGS" desc="Text informing parent about Google services that users can access, browsing data storage and Family Link parent settings."> <message name="IDS_EDU_LOGIN_INFO_PARENT_SETTINGS" desc="Text informing parent about Google services that users can access, browsing data storage and Family Link parent settings.">
G Suite for Education administrators determine which Google services their users can access while signed into a G Suite for Education account. This may include some features or services that your child was previously unable to access using this supervised account. School administrators are required to provide or obtain consent for the use of the services by their minor users. G Suite for Education administrators determine which Google services their users can access while signed into a G Suite for Education account. This may include some features or services that your child was previously unable to access using this supervised account. School administrators are required to provide or obtain consent for the use of the services by their minor users.
</message> </message>
<message name="IDS_EDU_LOGIN_INFO_DATA_PROTECTION" desc="Text informing parent about their child's data protection.">
Your child's data in Classroom will be protected. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$1<ex>https://support.google.com</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
</message>
<message name="IDS_EDU_LOGIN_INFO_RESOURCES_AVAILABILITY" desc="Text informing parent some resources for schoolwork might not be available.">
Resources for schoolwork might not be available or automatically loaded
Your child might not have access to:
<ph name="BEGIN_LIST">&lt;ul&gt;</ph>
<ph name="LIST_ITEM">&lt;li&gt;</ph>Applications and extensions that were installed by the school
<ph name="LIST_ITEM">&lt;li&gt;</ph>Bookmarks from a school Chromebook
<ph name="LIST_ITEM">&lt;li&gt;</ph>Autofill passwords to educational sites
<ph name="END_LIST">&lt;/ul&gt;</ph>
To get the full school experience on this device, your child should:
<ph name="BEGIN_OLIST">&lt;ol&gt;</ph>
<ph name="OLIST_ITEM">&lt;li&gt;</ph>Sign out of their Family Link managed account
<ph name="OLIST_ITEM">&lt;li&gt;</ph>Sign in with their GSuite for Education account on the sign-in screen. Note, however, this will mean school policies including app and website access settings will take effect over your Family Link supervision features (for instance, school administrators may allow YouTube if it’s necessary for homework, screentime would not be enforced, etc.)
<ph name="END_OLIST">&lt;/ol&gt;</ph>
</message>
<!-- <!--
IDS_EDU_LOGIN_INFO_* strings END IDS_EDU_LOGIN_INFO_* strings END
================================================================================== ==================================================================================
......
3ff94a5a7469934f208f8fedf756dea8736d9d26
\ No newline at end of file
bb5e6a878d7a98c8b7de545fd08bdc343436dcba
\ No newline at end of file
...@@ -40,7 +40,7 @@ constexpr char kConsentApiPath[] = ...@@ -40,7 +40,7 @@ constexpr char kConsentApiPath[] =
// Version of the parental consent text. Must be updated when consent text is // Version of the parental consent text. Must be updated when consent text is
// changed. Format of the text version is "v<GERRIT_CL_NUMBER>" with number of // changed. Format of the text version is "v<GERRIT_CL_NUMBER>" with number of
// the last CL where strings with information for parents were changed. // the last CL where strings with information for parents were changed.
constexpr char kConsentScreenTextVersion[] = "v2211143"; constexpr char kConsentScreenTextVersion[] = "v2261896";
// The text version which requires invalidation of the secondary accounts added // The text version which requires invalidation of the secondary accounts added
// before consent text changes. Format of the invalidation version is // before consent text changes. Format of the invalidation version is
// "iv<GERRIT_CL_NUMBER>". // "iv<GERRIT_CL_NUMBER>".
......
...@@ -42,7 +42,7 @@ constexpr char kRequestBodyTemplate[] = R"({ ...@@ -42,7 +42,7 @@ constexpr char kRequestBodyTemplate[] = R"({
}, },
"person_id": "me" "person_id": "me"
})"; })";
constexpr char kConsentScreenTextVersion[] = "v2211143"; constexpr char kConsentScreenTextVersion[] = "v2261896";
std::string GetTestRequestBody( std::string GetTestRequestBody(
const std::string& chrome_os_unicorn_edu_coexistence_id, const std::string& chrome_os_unicorn_edu_coexistence_id,
......
...@@ -84,13 +84,6 @@ void AddEduStrings(content::WebUIDataSource* source, ...@@ -84,13 +84,6 @@ void AddEduStrings(content::WebUIDataSource* source,
l10n_util::GetStringFUTF16( l10n_util::GetStringFUTF16(
IDS_EDU_LOGIN_INFO_BODY, IDS_EDU_LOGIN_INFO_BODY,
base::ASCIIToUTF16(chrome::kGsuiteTermsEducationPrivacyURL))); base::ASCIIToUTF16(chrome::kGsuiteTermsEducationPrivacyURL)));
source->AddString(
"parentInfoDataProtectionText",
l10n_util::GetStringFUTF16(
IDS_EDU_LOGIN_INFO_DATA_PROTECTION,
base::ASCIIToUTF16(chrome::kClassroomSigninLearnMoreURL)));
source->AddLocalizedString("parentInfoResourcesAvailabilityText",
IDS_EDU_LOGIN_INFO_RESOURCES_AVAILABILITY);
source->AddLocalizedString("coexistenceTitle", source->AddLocalizedString("coexistenceTitle",
IDS_EDU_LOGIN_INFO_COEXISTENCE_TITLE); IDS_EDU_LOGIN_INFO_COEXISTENCE_TITLE);
source->AddLocalizedString("coexistenceBody", source->AddLocalizedString("coexistenceBody",
......
...@@ -329,9 +329,6 @@ const char kChromeOSGestureEducationHelpURL[] = ...@@ -329,9 +329,6 @@ const char kChromeOSGestureEducationHelpURL[] =
const char kChromePaletteHelpURL[] = const char kChromePaletteHelpURL[] =
"https://support.google.com/chromebook?p=stylus_help"; "https://support.google.com/chromebook?p=stylus_help";
const char kClassroomSigninLearnMoreURL[] =
"https://support.google.com/chromebook/?p=familylink_accounts";
const char kCrosScheme[] = "cros"; const char kCrosScheme[] = "cros";
const char kCupsPrintLearnMoreURL[] = const char kCupsPrintLearnMoreURL[] =
......
...@@ -282,9 +282,6 @@ extern const char kChromeOSGestureEducationHelpURL[]; ...@@ -282,9 +282,6 @@ extern const char kChromeOSGestureEducationHelpURL[];
// Palette help link for Chrome. // Palette help link for Chrome.
extern const char kChromePaletteHelpURL[]; extern const char kChromePaletteHelpURL[];
// The URL for "How do I sign in to Classroom?" page.
extern const char kClassroomSigninLearnMoreURL[];
extern const char kCrosScheme[]; extern const char kCrosScheme[];
extern const char kCupsPrintLearnMoreURL[]; extern const char kCupsPrintLearnMoreURL[];
......
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