Skip to content

GitLab

T
tangled
Commit e5a42273 authored by Tina Wang's avatar Tina Wang Committed by Commit Bot
Browse files
Options

[ios] Add "Learn More" link to chrome://management page 

Mock: https://docs.google.com/presentation/d/1Tbe2Uh3QTYUKOkxo89npxkthhvEwLgCz13f5xW4KRRw/edit#slide=id.g8cf6ed5ed7_4_220

Screenshot: https://screenshot.googleplex.com/z6vcmmk63ML

Bug: 1111037
Change-Id: Iab795d0349561f9428e12e5fc0ecb7330ef1332b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2329749Reviewed-by: default avatarScott Violet <sky@chromium.org>
Reviewed-by: default avatarMike Dougherty <michaeldo@chromium.org>
Commit-Queue: Tina Wang <tinazwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#794635}
parent 7cd3013d
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 14 deletions
components/OWNERS
View file @ e5a42273
......@@ -16,6 +16,7 @@ per-file crash_strings.grdp=file://components/crash/OWNERS
per-file dom_distiller_strings.grdp=file://components/dom_distiller/OWNERS
per-file error_page_strings.grdp=file://components/error_page/OWNERS
per-file javascript_dialogs_strings.grdp=file://components/javascript_dialogs/OWNERS
per-file management_mobile_strings.grdp=file://components/management/OWNERS
per-file management_strings.grdp=file://docs/privacy/OWNERS
per-file media_message_center_strings.grdp=file://components/media_message_center/OWNERS
per-file new_or_sad_tab_strings.grdp=file://chrome/browser/ui/webui/ntp/OWNERS
......
components/components_strings.grd
View file @ e5a42273
......@@ -319,12 +319,15 @@
<part file="undo_strings.grdp" />
<part file="version_ui_strings.grdp" />
<if expr="not is_android">
<if expr="not is_android and not is_ios">
<part file="management_strings.grdp" />
</if>
<if expr="is_android">
<part file="android_system_error_page_strings.grdp" />
</if>
<if expr="is_ios">
<part file="management_ios_strings.grdp" />
</if>
<!-- Generic terms -->
<message name="IDS_CANCEL" desc="Used for Cancel on buttons">
......
components/management/resources/management.css
View file @ e5a42273
......@@ -5,7 +5,7 @@
/* TODO(crbug.com/1108981): adjust the style when the design is finalized. */
body {
color: var(--primary-color);
color: rgb(95, 99, 104);
font-size: 2em;
margin: 10%;
min-width: 500; /* Wrap content to screen on mobile. */
......@@ -13,6 +13,11 @@ body {
width: 80%;
}
a {
color: rgb(25, 103, 210);
text-decoration: none;
}
#main-message {
margin-bottom: 2em;
}
......
components/management/resources/management.html
View file @ e5a42273
......@@ -26,7 +26,9 @@
<body>
<div id="managed-info" class="hidden">
<div id="main-message">$i18n{managementMessage}</div>
<div id="secondary-message">$i18n{managedInfo}</div>
<div id="secondary-message">$i18n{managedInfo}
<a target="_blank" href=$i18n{learnMoreURL}>$i18n{learnMore}</a>
</div>
</div>
<div id="unmanaged-info" class="hidden">$i18n{unmanagedInfo}</div>
</body>
......
components/management_ios_strings.grdp 0 → 100644
View file @ e5a42273
<?xml version="1.0" encoding="utf-8"?>
<!-- Strings for the chrome://management page on mobile platform.-->
<grit-part>
<message name="IDS_IOS_MANAGEMENT_UI_DESC" desc="The descriptive text on chrome://management page when the browser is managed.">
Your administrator can change your browser setup remotely. Activity on this device may also be managed outside of Chrome.
</message>
<message name="IDS_IOS_MANAGEMENT_UI_LEARN_MORE_LINK" desc="The clickable text on chrome://management.">
Learn More
</message>
<message name="IDS_IOS_MANAGEMENT_UI_MESSAGE" desc="The main message at the top of chrome://management page when the browser is managed.">
Your browser is managed by your administrator.
</message>
<message name="IDS_IOS_MANAGEMENT_UI_UNMANAGED_DESC" desc="The descriptive text on chrome://management page when the browser is not managed.">
Your browser is not managed.
</message>
</grit-part>
components/management_ios_strings_grdp/IDS_IOS_MANAGEMENT_UI_LEARN_MORE_LINK.png.sha1 0 → 100644
View file @ e5a42273
6ef612cd2d8b99c8ea7fba1ed875524462519afa
\ No newline at end of file
components/management_ios_strings_grdp/OWNERS 0 → 100644
View file @ e5a42273
file://components/management/OWNERS
# COMPONENT: Management
components/management_ios_strings_grdp/README.md 0 → 100644
View file @ e5a42273
This directory of image SHA-1 hashes is used to improve translations of UI
strings through context images for translators.
See also: [Chrome Translation Screenshots - Instructions & FAQ
](https://docs.google.com/document/d/1nwYWDny20icMSpLUuV_LgrlbWKrYpbXOERUIZNH636o/edit#heading=h.2t7lc4cxo2au)
components/management_strings.grdp
View file @ e5a42273
......@@ -233,15 +233,4 @@
<message name="IDS_MANAGEMENT_PAGE_VISITED_VISIBLE_DATA" desc="Description of the visible data for the real time URL check feature.">
URLs of pages you visit are sent to Google Cloud or third parties for analysis. For example, they might be scanned to detect unsafe websites.
</message>
<!-- Strings for ios only -->
<message name="IDS_IOS_MANAGEMENT_UI_DESC" desc="The descriptive text on chrome://management page when the browser is managed. [iOS only]">
Your administrator can change your browser setup remotely. Activity on this device may also be managed outside of Chrome.
</message>
<message name="IDS_IOS_MANAGEMENT_UI_UNMANAGED_DESC" desc="The descriptive text on chrome://management page when the browser is not managed. [iOS only]">
Your browser is not managed.
</message>
<message name="IDS_IOS_MANAGEMENT_UI_MESSAGE" desc="The main message at the top of chrome://management page when the browser is managed. [iOS only]">
Your browser is managed by your administrator.
</message>
</grit-part>
ios/chrome/browser/chrome_url_constants.cc
View file @ e5a42273
......@@ -122,3 +122,6 @@ const char kReadingListReferrerURL[] =
"chrome://do_not_consider_for_most_visited/reading_list";
const char kChromeUIAboutNewTabURL[] = "about://newtab/";
const char kManagementLearnMoreURL[] =
"https://support.google.com/chrome/?p=is_chrome_managed";
ios/chrome/browser/chrome_url_constants.h
View file @ e5a42273
......@@ -114,4 +114,7 @@ extern const char kReadingListReferrerURL[];
// URL used internally by ios/web when loading the NTP.
extern const char kChromeUIAboutNewTabURL[];
// "Learn more" URL for enterprise management information.
extern const char kManagementLearnMoreURL[];
#endif // IOS_CHROME_BROWSER_CHROME_URL_CONSTANTS_H_
ios/chrome/browser/ui/webui/management/management_ui.mm
View file @ e5a42273
......@@ -27,12 +27,15 @@ web::WebUIIOSDataSource* CreateManagementUIHTMLSource() {
bool is_managed =
policy_connector && policy_connector->HasMachineLevelPolicies();
source->AddString("isManaged", is_managed ? "true" : "false");
source->AddString("learnMoreURL", kManagementLearnMoreURL);
source->AddLocalizedString("managementMessage",
IDS_IOS_MANAGEMENT_UI_MESSAGE);
source->AddLocalizedString("managedInfo", IDS_IOS_MANAGEMENT_UI_DESC);
source->AddLocalizedString("unmanagedInfo",
IDS_IOS_MANAGEMENT_UI_UNMANAGED_DESC);
source->AddLocalizedString("learnMore",
IDS_IOS_MANAGEMENT_UI_LEARN_MORE_LINK);
source->UseStringsJs();
source->AddResourcePath("management.css", IDR_MOBILE_MANAGEMENT_CSS);
......
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