Skip to content

GitLab

T
tangled
Commit 33f75bc3 authored by Yann Dago's avatar Yann Dago Committed by Commit Bot
Browse files
Options

Management WebUI: Remove overview section details 

The overview detailed section string contained misleading text and had
which has to be removed until a better alternative is found.

Visuals:
Account managed: http://screen/HxbAjSKBFC3
Account + Device managed multiple domains: http://screen/rfrth5atE3b
Account + Device managed same domains: http://screen/6XCAYGnGbRm
Device managed: http://screen/hA5y65Zjp9c

Bug: 971263
Change-Id: I5b2a66c4d6484024a60049b59dd78b0dfd287c07
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1645932
Commit-Queue: Yann Dago <ydago@chromium.org>
Reviewed-by: default avatarScott Violet <sky@chromium.org>
Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#666413}
parent 9e48e5d3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 361 deletions
chrome/browser/resources/management/management_browser_proxy.js
View file @ 33f75bc3
......@@ -30,18 +30,7 @@ management.BrowserReportingResponse;
/**
* @typedef {{
* overview: string,
* setup: string,
* data: string,
* }}
*/
management.ManagedInfo;
/**
* @typedef {{
* accountManagedInfo: ?management.ManagedInfo,
* browserManagementNotice: string,
* deviceManagedInfo: ?management.ManagedInfo,
* extensionReportingTitle: string,
* pageSubtitle: string,
* managed: boolean,
......
chrome/browser/resources/management/management_ui.html
View file @ 33f75bc3
......@@ -194,36 +194,15 @@
[[subtitle_]]
</h2>
</section>
<section class="overview-section">
<section class="overview-section" hidden="[[!managementOverview_]]">
<if expr="not chromeos">
<div inner-h-t-m-l="[[managementNoticeHtml_]]"></div>
</if>
<if expr="chromeos">
<div class="overview-container">
<img src="[[customerLogo_]]" hidden="[[!customerLogo_]]"
alt="" aria-hidden="true">
<div>
<div>[[managementOverview_]]</div>
<div>[[deviceManagedInfo_.overview]]</div>
<ul class="overview-messages"
hidden="[[!deviceManagedInfo_]]">
<li>
[[deviceManagedInfo_.setup]]
<a href="$i18nRaw{managementDeviceLearnMoreUrl}"
target="_blank">$i18n{learnMore}</a>
</li>
<li>[[deviceManagedInfo_.data]]</li>
</ul>
<div>[[accountManagedInfo_.overview]]</div>
<ul class="overview-messages" hidden="[[!accountManagedInfo_]]">
<li>
[[accountManagedInfo_.setup]]
<a href="$i18nRaw{managementAccountLearnMoreUrl}"
target="_blank">$i18n{learnMore}</a>
</li>
<li>[[accountManagedInfo_.data]]</li>
</ul>
</div>
<img src="[[customerLogo_]]" alt="" aria-hidden="true"
hidden="[[!customerLogo_]]">
<div>[[managementOverview_]]</div>
</div>
</if>
</section>
......
chrome/browser/resources/management/management_ui.js
View file @ 33f75bc3
......@@ -51,13 +51,8 @@ Polymer({
/** @private */
managementOverview_: String,
/** @private {?management.ManagedInfo} */
deviceManagedInfo_: Object,
// </if>
/** @private {?management.ManagedInfo} */
accountManagedInfo_: Object,
/** @private */
subtitle_: String,
......@@ -256,11 +251,9 @@ Polymer({
this.managed_ = data.managed;
this.extensionReportingSubtitle_ = data.extensionReportingTitle;
this.subtitle_ = data.pageSubtitle;
this.accountManagedInfo_ = data.accountManagedInfo;
// <if expr="chromeos">
this.customerLogo_ = data.customerLogo;
this.managementOverview_ = data.overview;
this.deviceManagedInfo_ = data.deviceManagedInfo;
// </if>
// <if expr="not chromeos">
this.managementNoticeHtml_ = data.browserManagementNotice;
......
chrome/browser/ui/webui/management_ui_browsertest.cc
View file @ 33f75bc3
......@@ -81,9 +81,6 @@ IN_PROC_BROWSER_TEST_F(ManagementUITest, ManagementStateChange) {
l10n_util::GetStringUTF16(IDS_MANAGEMENT_EXTENSIONS_INSTALLED)},
{"pageSubtitle",
l10n_util::GetStringUTF16(IDS_MANAGEMENT_NOT_MANAGED_SUBTITLE)},
{"accountManagedInfo.overview", base::string16()},
{"accountManagedInfo.data", base::string16()},
{"accountManagedInfo.setup", base::string16()},
};
VerifyTexts(unmanaged_value_ptr.get(), expected_unmanaged_values);
......@@ -114,13 +111,6 @@ IN_PROC_BROWSER_TEST_F(ManagementUITest, ManagementStateChange) {
{"extensionReportingTitle",
l10n_util::GetStringUTF16(IDS_MANAGEMENT_EXTENSIONS_INSTALLED)},
{"pageSubtitle", l10n_util::GetStringUTF16(IDS_MANAGEMENT_SUBTITLE)},
{"accountManagedInfo.overview",
l10n_util::GetStringUTF16(
IDS_MANAGEMENT_ACCOUNT_MANAGED_CLARIFICATION_UNKNOWN_DOMAIN)},
{"accountManagedInfo.data",
l10n_util::GetStringUTF16(IDS_MANAGEMENT_ACCOUNT_MANAGED_DATA)},
{"accountManagedInfo.setup",
l10n_util::GetStringUTF16(IDS_MANAGEMENT_ACCOUNT_MANAGED_SETUP)},
};
VerifyTexts(managed_value_ptr.get(), expected_managed_values);
......
chrome/browser/ui/webui/management_ui_handler.cc
View file @ 33f75bc3
......@@ -119,13 +119,11 @@ const char kManagementReportNetworkInterfaces[] =
"managementReportNetworkInterfaces";
const char kManagementReportUsers[] = "managementReportUsers";
const char kManagementPrinting[] = "managementPrinting";
const char kAccountManagedInfo[] = "accountManagedInfo";
const char kDeviceManagedInfo[] = "deviceManagedInfo";
const char kOverview[] = "overview";
#endif // defined(OS_CHROMEOS)
const char kOverview[] = "overview";
const char kAccountManagedInfo[] = "accountManagedInfo";
const char kSetup[] = "setup";
const char kData[] = "data";
const char kCustomerLogo[] = "customerLogo";
namespace {
......@@ -625,26 +623,6 @@ void ManagementUIHandler::OnFetchComplete(const GURL& url,
FireWebUIListener("managed_data_changed");
}
void AddStatusAccountManagedInfo(base::Value* status,
const std::string& account_domain) {
base::Value info(base::Value::Type::DICTIONARY);
if (account_domain.empty()) {
info.SetKey(
kOverview,
base::Value(l10n_util::GetStringUTF16(
IDS_MANAGEMENT_ACCOUNT_MANAGED_CLARIFICATION_UNKNOWN_DOMAIN)));
} else {
info.SetKey(kOverview, base::Value(l10n_util::GetStringFUTF16(
IDS_MANAGEMENT_ACCOUNT_MANAGED_CLARIFICATION,
base::UTF8ToUTF16(account_domain))));
}
info.SetKey(kSetup, base::Value(l10n_util::GetStringUTF16(
IDS_MANAGEMENT_ACCOUNT_MANAGED_SETUP)));
info.SetKey(kData, base::Value(l10n_util::GetStringUTF16(
IDS_MANAGEMENT_ACCOUNT_MANAGED_DATA)));
status->SetKey(kAccountManagedInfo, std::move(info));
}
#if defined(OS_CHROMEOS)
void AddStatusOverviewManagedDeviceAndAccount(
base::Value* status,
......@@ -657,40 +635,14 @@ void AddStatusOverviewManagedDeviceAndAccount(
status->SetKey(kOverview, base::Value(l10n_util::GetStringFUTF16(
IDS_MANAGEMENT_DEVICE_AND_ACCOUNT_MANAGED_BY,
base::UTF8ToUTF16(device_domain))));
base::Value info(base::Value::Type::DICTIONARY);
info.SetKey(kOverview,
base::Value(l10n_util::GetStringFUTF16(
IDS_MANAGEMENT_DEVICE_AND_ACCOUNT_MANAGED_CLARIFICATION,
base::UTF8ToUTF16(device_domain))));
info.SetKey(kSetup, base::Value(l10n_util::GetStringUTF16(
IDS_MANAGEMENT_DEVICE_AND_ACCOUNT_MANAGED_SETUP)));
info.SetKey(kData, base::Value(l10n_util::GetStringUTF16(
IDS_MANAGEMENT_DEVICE_AND_ACCOUNT_MANAGED_DATA)));
status->SetKey(kDeviceManagedInfo, std::move(info));
return;
}
if (account_managed) {
AddStatusAccountManagedInfo(
status, !account_domain.empty() ? account_domain : device_domain);
if (!account_domain.empty()) {
status->SetKey(kOverview, base::Value(l10n_util::GetStringFUTF16(
IDS_MANAGEMENT_ACCOUNT_MANAGED_BY,
base::UTF8ToUTF16(account_domain))));
}
}
if (device_managed) {
base::Value info(base::Value::Type::DICTIONARY);
info.SetKey(kOverview, base::Value(l10n_util::GetStringFUTF16(
IDS_MANAGEMENT_DEVICE_MANAGED_CLARIFICATION,
base::UTF8ToUTF16(device_domain))));
info.SetKey(kSetup, base::Value(l10n_util::GetStringUTF16(
IDS_MANAGEMENT_DEVICE_MANAGED_SETUP)));
info.SetKey(kData, base::Value(l10n_util::GetStringUTF16(
IDS_MANAGEMENT_DEVICE_MANAGED_DATA)));
status->SetKey(kDeviceManagedInfo, std::move(info));
if (account_managed && !account_domain.empty()) {
status->SetKey(kOverview, base::Value(l10n_util::GetStringFUTF16(
IDS_MANAGEMENT_ACCOUNT_MANAGED_BY,
base::UTF8ToUTF16(account_domain))));
}
if (account_managed && device_managed && !account_domain.empty() &&
......@@ -744,9 +696,6 @@ void ManagementUIHandler::GetManagementStatus(Profile* profile,
AddStatusOverviewManagedDeviceAndAccount(
status, device_managed_, account_managed_ || primary_user_managed,
device_domain, account_domain);
#else
if (managed_())
AddStatusAccountManagedInfo(status, GetAccountDomain(profile));
#endif // defined(OS_CHROMEOS)
}
......
components/management_strings.grdp
View file @ 33f75bc3
......@@ -69,40 +69,7 @@
<message name="IDS_MANAGEMENT_ACCOUNT_MANAGED_BY" desc="Message indicating that the account is enterprise enrolled to be managed by an administrator">
Your account is managed by <ph name="ENROLLMENT_DOMAIN">$1<ex>example.com</ex></ph>.
</message>
<!-- Device managed clarification -->
<message name="IDS_MANAGEMENT_DEVICE_MANAGED_CLARIFICATION" desc="First part of the sentence of the managed device clarification.">
As the manager of this device, <ph name="ENROLLMENT_DOMAIN">$1<ex>example.com</ex></ph>:
</message>
<message name="IDS_MANAGEMENT_DEVICE_MANAGED_SETUP" desc="Continuation of the managed device clarification sentence explaining device setup management.">
Can remotely change your device setup.
</message>
<message name="IDS_MANAGEMENT_DEVICE_MANAGED_DATA" desc="Continuation of the managed device clarification sentence explaining device user data management.">
Controls how your device data is handled. How Google processes and uses your device data is determined by your device manager.
</message>
<!-- Device and account managed clarification -->
<message name="IDS_MANAGEMENT_DEVICE_AND_ACCOUNT_MANAGED_CLARIFICATION" desc="First part of the sentence of the managed device and account clarification, when enrollment domain equals account domain.">
As the manager of your device and account, <ph name="ENROLLMENT_DOMAIN">$1<ex>example.com</ex></ph>:
</message>
<message name="IDS_MANAGEMENT_DEVICE_AND_ACCOUNT_MANAGED_SETUP" desc="Continuation of the managed device and account clarification sentence explaining device and account setup management.">
Can remotely change your device and account setup.
</message>
<message name="IDS_MANAGEMENT_DEVICE_AND_ACCOUNT_MANAGED_DATA" desc="Continuation of the managed device and account clarification sentence explaining device and account user data management.">
Controls how your device and account data is handled. How Google processes and uses your device and account data is determined by your device and account manager.
</message>
</if>
<!-- Account managed clarification -->
<message name="IDS_MANAGEMENT_ACCOUNT_MANAGED_CLARIFICATION_UNKNOWN_DOMAIN" desc="First part of the sentence for managed account clarification. This is a header over a bullet point list.">
The company, school, or organization that manages this account:
</message>
<message name="IDS_MANAGEMENT_ACCOUNT_MANAGED_CLARIFICATION" desc="First part of the sentence for managed account clarification. This is a header over a bullet point list.">
As the manager of your account, <ph name="ACCOUNT_DOMAIN">$1<ex>example.com</ex></ph>:
</message>
<message name="IDS_MANAGEMENT_ACCOUNT_MANAGED_SETUP" desc="Continuation of the managed account clarification sentence explaining account setup management.">
Can remotely change your account setup.
</message>
<message name="IDS_MANAGEMENT_ACCOUNT_MANAGED_DATA" desc="Continuation of the managed account clarification sentence explaining account user data management.">
Controls how your account data is handled. How Google processes and uses your account data is determined by your account manager.
</message>
<if expr="chromeos">
<!-- Strings related to Local trust roots section -->
......
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