Commit 9a5f970b authored by Tina Wang's avatar Tina Wang Committed by Chromium LUCI CQ

[ios] Change management message in the popup menu

Previous: https://screenshot.googleplex.com/9kgVDiHMWknAeAN
Now: https://screenshot.googleplex.com/3nRzSdcki58YoQU

Bug: 1148843
Change-Id: If1c2bef46754f15496e4c9247fba9ff8e46cd17e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2584564
Commit-Queue: Tina Wang <tinazwang@chromium.org>
Reviewed-by: default avatarSergio Collazos <sczs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836696}
parent 13c7fe47
...@@ -1682,6 +1682,9 @@ While in incognito, sites can't use cookies to see your browsing activity across ...@@ -1682,6 +1682,9 @@ While in incognito, sites can't use cookies to see your browsing activity across
<message name="IDS_IOS_PASSWORDS" desc="Title for the view in Settings for managing saved passwords. [Length: 15em] [iOS only]"> <message name="IDS_IOS_PASSWORDS" desc="Title for the view in Settings for managing saved passwords. [Length: 15em] [iOS only]">
Passwords Passwords
</message> </message>
<message name="IDS_IOS_ENTERPRISE_MANAGED_INFO" desc="Text displayed to inform the user that the browser is managed by one or more Enterprise policies. [iOS only]">
Managed by your organization. Some features may be unavailable. <ph name="BEGIN_LINK">BEGIN_LINK</ph>Learn more<ph name="END_LINK">END_LINK</ph>
</message>
<message name="IDS_IOS_ENTERPRISE_MANAGED_SETTING_DESC_WITH_COMPANY_NAME" desc="Text displayed to inform the user that the browser is managed by Enterprise policies. MANAGER can be a domain or an email address. [iOS only]"> <message name="IDS_IOS_ENTERPRISE_MANAGED_SETTING_DESC_WITH_COMPANY_NAME" desc="Text displayed to inform the user that the browser is managed by Enterprise policies. MANAGER can be a domain or an email address. [iOS only]">
Managed by <ph name="MANAGER">$1<ex>Google</ex></ph>. <ph name="BEGIN_LINK">BEGIN_LINK</ph>Learn more<ph name="END_LINK">END_LINK</ph> Managed by <ph name="MANAGER">$1<ex>Google</ex></ph>. <ph name="BEGIN_LINK">BEGIN_LINK</ph>Learn more<ph name="END_LINK">END_LINK</ph>
</message> </message>
......
bbc916089fdd330a4c788c6f8780cbc222599f59
\ No newline at end of file
...@@ -1069,8 +1069,7 @@ PopupMenuTextItem* CreateEnterpriseInfoItem(NSString* imageName, ...@@ -1069,8 +1069,7 @@ PopupMenuTextItem* CreateEnterpriseInfoItem(NSString* imageName,
// Creates the section for enterprise info. // Creates the section for enterprise info.
- (NSArray<TableViewItem*>*)enterpriseInfoSection { - (NSArray<TableViewItem*>*)enterpriseInfoSection {
NSString* message = l10n_util::GetNSString( NSString* message = l10n_util::GetNSString(IDS_IOS_ENTERPRISE_MANAGED_INFO);
IDS_IOS_ENTERPRISE_MANAGED_SETTING_DESC_WITHOUT_COMPANY_NAME);
TableViewItem* enterpriseInfoItem = CreateEnterpriseInfoItem( TableViewItem* enterpriseInfoItem = CreateEnterpriseInfoItem(
@"popup_menu_enterprise_icon", message, @"popup_menu_enterprise_icon", message,
PopupMenuActionEnterpriseInfoMessage, kTextMenuEnterpriseInfo); PopupMenuActionEnterpriseInfoMessage, kTextMenuEnterpriseInfo);
......
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