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
(cherry picked from commit 33f75bc37eab9aecd2ff5b69d193e64ec27fdc0c)
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: Scott Violet <sky@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#666413}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1648701
Reviewed-by: Yann Dago <ydago@chromium.org>
Cr-Commit-Position: refs/branch-heads/3809@{#406}
Cr-Branched-From: d82dec1a818f378c464ba307ddd9c92133eac355-refs/heads/master@{#665002}
diff --git a/chrome/browser/resources/management/management_browser_proxy.js b/chrome/browser/resources/management/management_browser_proxy.js
index b25f115..3d73753a 100644
--- a/chrome/browser/resources/management/management_browser_proxy.js
+++ b/chrome/browser/resources/management/management_browser_proxy.js
@@ -30,18 +30,7 @@
/**
* @typedef {{
- * overview: string,
- * setup: string,
- * data: string,
- * }}
- */
-management.ManagedInfo;
-
-/**
- * @typedef {{
- * accountManagedInfo: ?management.ManagedInfo,
* browserManagementNotice: string,
- * deviceManagedInfo: ?management.ManagedInfo,
* extensionReportingTitle: string,
* pageSubtitle: string,
* managed: boolean,
diff --git a/chrome/browser/resources/management/management_ui.html b/chrome/browser/resources/management/management_ui.html
index a3b3522..ee5a1aa 100644
--- a/chrome/browser/resources/management/management_ui.html
+++ b/chrome/browser/resources/management/management_ui.html
@@ -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>
diff --git a/chrome/browser/resources/management/management_ui.js b/chrome/browser/resources/management/management_ui.js
index 12682482..afc2712 100644
--- a/chrome/browser/resources/management/management_ui.js
+++ b/chrome/browser/resources/management/management_ui.js
@@ -51,13 +51,8 @@
/** @private */
managementOverview_: String,
- /** @private {?management.ManagedInfo} */
- deviceManagedInfo_: Object,
// </if>
- /** @private {?management.ManagedInfo} */
- accountManagedInfo_: Object,
-
/** @private */
subtitle_: String,
@@ -256,11 +251,9 @@
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;
diff --git a/chrome/browser/ui/webui/management_ui_browsertest.cc b/chrome/browser/ui/webui/management_ui_browsertest.cc
index e921d9e..8cd3f96 100644
--- a/chrome/browser/ui/webui/management_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/management_ui_browsertest.cc
@@ -81,9 +81,6 @@
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 @@
{"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);
diff --git a/chrome/browser/ui/webui/management_ui_handler.cc b/chrome/browser/ui/webui/management_ui_handler.cc
index 7901fd8..e6cdb78a 100644
--- a/chrome/browser/ui/webui/management_ui_handler.cc
+++ b/chrome/browser/ui/webui/management_ui_handler.cc
@@ -119,13 +119,11 @@
"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 @@
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 @@
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 @@
AddStatusOverviewManagedDeviceAndAccount(
status, device_managed_, account_managed_ || primary_user_managed,
device_domain, account_domain);
-#else
- if (managed_())
- AddStatusAccountManagedInfo(status, GetAccountDomain(profile));
#endif // defined(OS_CHROMEOS)
}
diff --git a/chrome/browser/ui/webui/management_ui_handler_unittest.cc b/chrome/browser/ui/webui/management_ui_handler_unittest.cc
index 83ed53f..c118fd3 100644
--- a/chrome/browser/ui/webui/management_ui_handler_unittest.cc
+++ b/chrome/browser/ui/webui/management_ui_handler_unittest.cc
@@ -35,13 +35,7 @@
struct ContextualManagementSourceUpdate {
base::string16* extension_reporting_title;
base::string16* subtitle;
- base::string16* management_account_overview;
- base::string16* management_account_overview_data_notice;
- base::string16* management_account_overview_setup_notice;
#if defined(OS_CHROMEOS)
- base::string16* management_device_overview;
- base::string16* management_device_overview_data_notice;
- base::string16* management_device_overview_setup_notice;
base::string16* management_overview;
#else
base::string16* browser_management_notice;
@@ -114,19 +108,7 @@
data.GetString("extensionReportingTitle",
extracted.extension_reporting_title);
data.GetString("pageSubtitle", extracted.subtitle);
- data.GetString("accountManagedInfo.overview",
- extracted.management_account_overview);
- data.GetString("accountManagedInfo.data",
- extracted.management_account_overview_data_notice);
- data.GetString("accountManagedInfo.setup",
- extracted.management_account_overview_setup_notice);
#if defined(OS_CHROMEOS)
- data.GetString("deviceManagedInfo.overview",
- extracted.management_device_overview);
- data.GetString("deviceManagedInfo.data",
- extracted.management_device_overview_data_notice);
- data.GetString("deviceManagedInfo.setup",
- extracted.management_device_overview_setup_notice);
data.GetString("overview", extracted.management_overview);
#else
data.GetString("browserManagementNotice",
@@ -150,17 +132,11 @@
base::string16 extension_reporting_title;
base::string16 subtitle;
- base::string16 management_account_overview;
- base::string16 management_account_overview_data_notice;
- base::string16 management_account_overview_setup_notice;
base::string16 browser_management_notice;
bool managed;
ContextualManagementSourceUpdate extracted{
&extension_reporting_title,
&subtitle,
- &management_account_overview,
- &management_account_overview_data_notice,
- &management_account_overview_setup_notice,
&browser_management_notice,
&managed};
@@ -177,9 +153,6 @@
base::UTF8ToUTF16(chrome::kManagedUiLearnMoreUrl)));
EXPECT_EQ(subtitle,
l10n_util::GetStringUTF16(IDS_MANAGEMENT_NOT_MANAGED_SUBTITLE));
- EXPECT_EQ(management_account_overview, base::string16());
- EXPECT_EQ(management_account_overview_data_notice, base::string16());
- EXPECT_EQ(management_account_overview_setup_notice, base::string16());
}
TEST_F(ManagementUIHandlerTests,
@@ -188,17 +161,11 @@
base::string16 extension_reporting_title;
base::string16 subtitle;
- base::string16 management_account_overview;
- base::string16 management_account_overview_data_notice;
- base::string16 management_account_overview_setup_notice;
base::string16 browser_management_notice;
bool managed;
ContextualManagementSourceUpdate extracted{
&extension_reporting_title,
&subtitle,
- &management_account_overview,
- &management_account_overview_data_notice,
- &management_account_overview_setup_notice,
&browser_management_notice,
&managed};
@@ -206,7 +173,7 @@
auto data = handler_.GetContextualManagedDataForTesting(profile.get());
ExtractContextualSourceUpdate(data, extracted);
- EXPECT_EQ(data.DictSize(), 5u);
+ EXPECT_EQ(data.DictSize(), 4u);
EXPECT_EQ(extension_reporting_title,
l10n_util::GetStringUTF16(IDS_MANAGEMENT_EXTENSIONS_INSTALLED));
EXPECT_EQ(browser_management_notice,
@@ -214,13 +181,6 @@
IDS_MANAGEMENT_BROWSER_NOTICE,
base::UTF8ToUTF16(chrome::kManagedUiLearnMoreUrl)));
EXPECT_EQ(subtitle, l10n_util::GetStringUTF16(IDS_MANAGEMENT_SUBTITLE));
- EXPECT_EQ(management_account_overview,
- l10n_util::GetStringUTF16(
- IDS_MANAGEMENT_ACCOUNT_MANAGED_CLARIFICATION_UNKNOWN_DOMAIN));
- EXPECT_EQ(management_account_overview_data_notice,
- l10n_util::GetStringUTF16(IDS_MANAGEMENT_ACCOUNT_MANAGED_DATA));
- EXPECT_EQ(management_account_overview_setup_notice,
- l10n_util::GetStringUTF16(IDS_MANAGEMENT_ACCOUNT_MANAGED_SETUP));
EXPECT_TRUE(managed);
}
@@ -232,17 +192,11 @@
base::string16 extensions_installed;
base::string16 subtitle;
- base::string16 management_account_overview;
- base::string16 management_account_overview_data_notice;
- base::string16 management_account_overview_setup_notice;
base::string16 browser_management_notice;
bool managed;
ContextualManagementSourceUpdate extracted{
&extensions_installed,
&subtitle,
- &management_account_overview,
- &management_account_overview_data_notice,
- &management_account_overview_setup_notice,
&browser_management_notice,
&managed};
@@ -250,7 +204,7 @@
auto data = handler_.GetContextualManagedDataForTesting(profile.get());
ExtractContextualSourceUpdate(data, extracted);
- EXPECT_EQ(data.DictSize(), 5u);
+ EXPECT_EQ(data.DictSize(), 4u);
EXPECT_EQ(extensions_installed,
l10n_util::GetStringUTF16(IDS_MANAGEMENT_EXTENSIONS_INSTALLED));
EXPECT_EQ(browser_management_notice,
@@ -258,13 +212,6 @@
IDS_MANAGEMENT_BROWSER_NOTICE,
base::UTF8ToUTF16(chrome::kManagedUiLearnMoreUrl)));
EXPECT_EQ(subtitle, l10n_util::GetStringUTF16(IDS_MANAGEMENT_SUBTITLE));
- EXPECT_EQ(management_account_overview,
- l10n_util::GetStringUTF16(
- IDS_MANAGEMENT_ACCOUNT_MANAGED_CLARIFICATION_UNKNOWN_DOMAIN));
- EXPECT_EQ(management_account_overview_data_notice,
- l10n_util::GetStringUTF16(IDS_MANAGEMENT_ACCOUNT_MANAGED_DATA));
- EXPECT_EQ(management_account_overview_setup_notice,
- l10n_util::GetStringUTF16(IDS_MANAGEMENT_ACCOUNT_MANAGED_SETUP));
EXPECT_TRUE(managed);
}
@@ -276,17 +223,11 @@
base::string16 extension_reporting_title;
base::string16 subtitle;
- base::string16 management_account_overview;
- base::string16 management_account_overview_data_notice;
- base::string16 management_account_overview_setup_notice;
base::string16 browser_management_notice;
bool managed;
ContextualManagementSourceUpdate extracted{
&extension_reporting_title,
&subtitle,
- &management_account_overview,
- &management_account_overview_data_notice,
- &management_account_overview_setup_notice,
&browser_management_notice,
&managed};
@@ -305,9 +246,6 @@
base::UTF8ToUTF16(chrome::kManagedUiLearnMoreUrl)));
EXPECT_EQ(subtitle,
l10n_util::GetStringUTF16(IDS_MANAGEMENT_NOT_MANAGED_SUBTITLE));
- EXPECT_EQ(management_account_overview, base::string16());
- EXPECT_EQ(management_account_overview_data_notice, base::string16());
- EXPECT_EQ(management_account_overview_setup_notice, base::string16());
EXPECT_FALSE(managed);
}
@@ -319,17 +257,11 @@
base::string16 extension_reporting_title;
base::string16 subtitle;
- base::string16 management_account_overview;
- base::string16 management_account_overview_data_notice;
- base::string16 management_account_overview_setup_notice;
base::string16 browser_management_notice;
bool managed;
ContextualManagementSourceUpdate extracted{
&extension_reporting_title,
&subtitle,
- &management_account_overview,
- &management_account_overview_data_notice,
- &management_account_overview_setup_notice,
&browser_management_notice,
&managed};
@@ -347,9 +279,6 @@
base::UTF8ToUTF16(chrome::kManagedUiLearnMoreUrl)));
EXPECT_EQ(subtitle,
l10n_util::GetStringUTF16(IDS_MANAGEMENT_NOT_MANAGED_SUBTITLE));
- EXPECT_EQ(management_account_overview, base::string16());
- EXPECT_EQ(management_account_overview_data_notice, base::string16());
- EXPECT_EQ(management_account_overview_setup_notice, base::string16());
EXPECT_FALSE(managed);
}
@@ -361,17 +290,11 @@
base::string16 extension_reporting_title;
base::string16 subtitle;
- base::string16 management_account_overview;
- base::string16 management_account_overview_data_notice;
- base::string16 management_account_overview_setup_notice;
base::string16 browser_management_notice;
bool managed;
ContextualManagementSourceUpdate extracted{
&extension_reporting_title,
&subtitle,
- &management_account_overview,
- &management_account_overview_data_notice,
- &management_account_overview_setup_notice,
&browser_management_notice,
&managed};
@@ -380,7 +303,7 @@
auto data = handler_.GetContextualManagedDataForTesting(profile.get());
ExtractContextualSourceUpdate(data, extracted);
- EXPECT_EQ(data.DictSize(), 5u);
+ EXPECT_EQ(data.DictSize(), 4u);
EXPECT_EQ(extension_reporting_title,
l10n_util::GetStringFUTF16(IDS_MANAGEMENT_EXTENSIONS_INSTALLED_BY,
base::UTF8ToUTF16("manager.com")));
@@ -391,14 +314,6 @@
EXPECT_EQ(subtitle,
l10n_util::GetStringFUTF16(IDS_MANAGEMENT_SUBTITLE_MANAGED_BY,
base::UTF8ToUTF16("manager.com")));
- EXPECT_EQ(
- management_account_overview,
- l10n_util::GetStringFUTF16(IDS_MANAGEMENT_ACCOUNT_MANAGED_CLARIFICATION,
- base::UTF8ToUTF16("manager.com")));
- EXPECT_EQ(management_account_overview_data_notice,
- l10n_util::GetStringUTF16(IDS_MANAGEMENT_ACCOUNT_MANAGED_DATA));
- EXPECT_EQ(management_account_overview_setup_notice,
- l10n_util::GetStringUTF16(IDS_MANAGEMENT_ACCOUNT_MANAGED_SETUP));
EXPECT_TRUE(managed);
}
@@ -414,23 +329,11 @@
base::string16 extension_reporting_title;
base::string16 subtitle;
- base::string16 management_account_overview;
- base::string16 management_account_overview_data_notice;
- base::string16 management_account_overview_setup_notice;
- base::string16 management_device_overview;
- base::string16 management_device_overview_data_notice;
- base::string16 management_device_overview_setup_notice;
base::string16 management_overview;
bool managed;
ContextualManagementSourceUpdate extracted{
&extension_reporting_title,
&subtitle,
- &management_account_overview,
- &management_account_overview_data_notice,
- &management_account_overview_setup_notice,
- &management_device_overview,
- &management_device_overview_data_notice,
- &management_device_overview_setup_notice,
&management_overview,
&managed};
@@ -447,17 +350,6 @@
l10n_util::GetStringFUTF16(IDS_MANAGEMENT_SUBTITLE_MANAGED_BY,
l10n_util::GetStringUTF16(device_type),
base::UTF8ToUTF16("manager.com")));
- EXPECT_EQ(
- management_account_overview,
- l10n_util::GetStringFUTF16(IDS_MANAGEMENT_ACCOUNT_MANAGED_CLARIFICATION,
- base::UTF8ToUTF16("manager.com")));
- EXPECT_EQ(management_account_overview_data_notice,
- l10n_util::GetStringUTF16(IDS_MANAGEMENT_ACCOUNT_MANAGED_DATA));
- EXPECT_EQ(management_account_overview_setup_notice,
- l10n_util::GetStringUTF16(IDS_MANAGEMENT_ACCOUNT_MANAGED_SETUP));
- EXPECT_EQ(management_device_overview, base::string16());
- EXPECT_EQ(management_device_overview_data_notice, base::string16());
- EXPECT_EQ(management_device_overview_setup_notice, base::string16());
EXPECT_EQ(management_overview,
l10n_util::GetStringFUTF16(IDS_MANAGEMENT_ACCOUNT_MANAGED_BY,
base::UTF8ToUTF16("manager.com")));
@@ -472,23 +364,11 @@
base::string16 extension_reporting_title;
base::string16 subtitle;
- base::string16 management_account_overview;
- base::string16 management_account_overview_data_notice;
- base::string16 management_account_overview_setup_notice;
- base::string16 management_device_overview;
- base::string16 management_device_overview_data_notice;
- base::string16 management_device_overview_setup_notice;
base::string16 management_overview;
bool managed;
ContextualManagementSourceUpdate extracted{
&extension_reporting_title,
&subtitle,
- &management_account_overview,
- &management_account_overview_data_notice,
- &management_account_overview_setup_notice,
- &management_device_overview,
- &management_device_overview_data_notice,
- &management_device_overview_setup_notice,
&management_overview,
&managed};
@@ -503,13 +383,6 @@
EXPECT_EQ(subtitle,
l10n_util::GetStringFUTF16(IDS_MANAGEMENT_SUBTITLE_MANAGED,
l10n_util::GetStringUTF16(device_type)));
- EXPECT_EQ(management_account_overview_data_notice,
- l10n_util::GetStringUTF16(IDS_MANAGEMENT_ACCOUNT_MANAGED_DATA));
- EXPECT_EQ(management_account_overview_setup_notice,
- l10n_util::GetStringUTF16(IDS_MANAGEMENT_ACCOUNT_MANAGED_SETUP));
- EXPECT_EQ(management_device_overview, base::string16());
- EXPECT_EQ(management_device_overview_data_notice, base::string16());
- EXPECT_EQ(management_device_overview_setup_notice, base::string16());
EXPECT_EQ(management_overview, base::string16());
EXPECT_TRUE(managed);
}
@@ -523,23 +396,11 @@
base::string16 extension_reporting_title;
base::string16 subtitle;
- base::string16 management_account_overview;
- base::string16 management_account_overview_data_notice;
- base::string16 management_account_overview_setup_notice;
- base::string16 management_device_overview;
- base::string16 management_device_overview_data_notice;
- base::string16 management_device_overview_setup_notice;
base::string16 management_overview;
bool managed;
ContextualManagementSourceUpdate extracted{
&extension_reporting_title,
&subtitle,
- &management_account_overview,
- &management_account_overview_data_notice,
- &management_account_overview_setup_notice,
- &management_device_overview,
- &management_device_overview_data_notice,
- &management_device_overview_setup_notice,
&management_overview,
&managed};
@@ -555,16 +416,6 @@
EXPECT_EQ(extension_reporting_title,
l10n_util::GetStringFUTF16(IDS_MANAGEMENT_EXTENSIONS_INSTALLED_BY,
device_domain()));
- EXPECT_EQ(management_account_overview, base::string16());
- EXPECT_EQ(management_account_overview_data_notice, base::string16());
- EXPECT_EQ(management_account_overview_setup_notice, base::string16());
- EXPECT_EQ(management_device_overview,
- l10n_util::GetStringFUTF16(
- IDS_MANAGEMENT_DEVICE_MANAGED_CLARIFICATION, device_domain()));
- EXPECT_EQ(management_device_overview_data_notice,
- l10n_util::GetStringUTF16(IDS_MANAGEMENT_DEVICE_MANAGED_DATA));
- EXPECT_EQ(management_device_overview_setup_notice,
- l10n_util::GetStringUTF16(IDS_MANAGEMENT_DEVICE_MANAGED_SETUP));
EXPECT_EQ(management_overview, base::string16());
EXPECT_TRUE(managed);
}
@@ -578,23 +429,11 @@
base::string16 extension_reporting_title;
base::string16 subtitle;
- base::string16 management_account_overview;
- base::string16 management_account_overview_data_notice;
- base::string16 management_account_overview_setup_notice;
- base::string16 management_device_overview;
- base::string16 management_device_overview_data_notice;
- base::string16 management_device_overview_setup_notice;
base::string16 management_overview;
bool managed;
ContextualManagementSourceUpdate extracted{
&extension_reporting_title,
&subtitle,
- &management_account_overview,
- &management_account_overview_data_notice,
- &management_account_overview_setup_notice,
- &management_device_overview,
- &management_device_overview_data_notice,
- &management_device_overview_setup_notice,
&management_overview,
&managed};
@@ -610,19 +449,6 @@
EXPECT_EQ(extension_reporting_title,
l10n_util::GetStringFUTF16(IDS_MANAGEMENT_EXTENSIONS_INSTALLED_BY,
device_domain()));
- EXPECT_EQ(management_account_overview, base::string16());
- EXPECT_EQ(management_account_overview_data_notice, base::string16());
- EXPECT_EQ(management_account_overview_setup_notice, base::string16());
- EXPECT_EQ(management_device_overview,
- l10n_util::GetStringFUTF16(
- IDS_MANAGEMENT_DEVICE_AND_ACCOUNT_MANAGED_CLARIFICATION,
- device_domain()));
- EXPECT_EQ(management_device_overview_data_notice,
- l10n_util::GetStringUTF16(
- IDS_MANAGEMENT_DEVICE_AND_ACCOUNT_MANAGED_DATA));
- EXPECT_EQ(management_device_overview_setup_notice,
- l10n_util::GetStringUTF16(
- IDS_MANAGEMENT_DEVICE_AND_ACCOUNT_MANAGED_SETUP));
EXPECT_EQ(management_overview,
l10n_util::GetStringFUTF16(
IDS_MANAGEMENT_DEVICE_AND_ACCOUNT_MANAGED_BY, device_domain()));
@@ -638,23 +464,11 @@
base::string16 extension_reporting_title;
base::string16 subtitle;
- base::string16 management_account_overview;
- base::string16 management_account_overview_data_notice;
- base::string16 management_account_overview_setup_notice;
- base::string16 management_device_overview;
- base::string16 management_device_overview_data_notice;
- base::string16 management_device_overview_setup_notice;
base::string16 management_overview;
bool managed;
ContextualManagementSourceUpdate extracted{
&extension_reporting_title,
&subtitle,
- &management_account_overview,
- &management_account_overview_data_notice,
- &management_account_overview_setup_notice,
- &management_device_overview,
- &management_device_overview_data_notice,
- &management_device_overview_setup_notice,
&management_overview,
&managed};
@@ -670,17 +484,6 @@
EXPECT_EQ(extension_reporting_title,
l10n_util::GetStringFUTF16(IDS_MANAGEMENT_EXTENSIONS_INSTALLED_BY,
device_domain()));
- EXPECT_EQ(management_account_overview_data_notice,
- l10n_util::GetStringUTF16(IDS_MANAGEMENT_ACCOUNT_MANAGED_DATA));
- EXPECT_EQ(management_account_overview_setup_notice,
- l10n_util::GetStringUTF16(IDS_MANAGEMENT_ACCOUNT_MANAGED_SETUP));
- EXPECT_EQ(management_device_overview,
- l10n_util::GetStringFUTF16(
- IDS_MANAGEMENT_DEVICE_MANAGED_CLARIFICATION, device_domain()));
- EXPECT_EQ(management_device_overview_data_notice,
- l10n_util::GetStringUTF16(IDS_MANAGEMENT_DEVICE_MANAGED_DATA));
- EXPECT_EQ(management_device_overview_setup_notice,
- l10n_util::GetStringUTF16(IDS_MANAGEMENT_DEVICE_MANAGED_SETUP));
EXPECT_EQ(management_overview,
l10n_util::GetStringFUTF16(
IDS_MANAGEMENT_DEVICE_MANAGED_BY_ACCOUNT_MANAGED_BY,
@@ -694,23 +497,11 @@
base::string16 extension_reporting_title;
base::string16 subtitle;
- base::string16 management_account_overview;
- base::string16 management_account_overview_data_notice;
- base::string16 management_account_overview_setup_notice;
- base::string16 management_device_overview;
- base::string16 management_device_overview_data_notice;
- base::string16 management_device_overview_setup_notice;
base::string16 management_overview;
bool managed;
ContextualManagementSourceUpdate extracted{
&extension_reporting_title,
&subtitle,
- &management_account_overview,
- &management_account_overview_data_notice,
- &management_account_overview_setup_notice,
- &management_device_overview,
- &management_device_overview_data_notice,
- &management_device_overview_setup_notice,
&management_overview,
&managed};
@@ -723,12 +514,6 @@
l10n_util::GetStringUTF16(device_type)));
EXPECT_EQ(extension_reporting_title,
l10n_util::GetStringUTF16(IDS_MANAGEMENT_EXTENSIONS_INSTALLED));
- EXPECT_EQ(management_account_overview, base::string16());
- EXPECT_EQ(management_account_overview_data_notice, base::string16());
- EXPECT_EQ(management_account_overview_setup_notice, base::string16());
- EXPECT_EQ(management_device_overview, base::string16());
- EXPECT_EQ(management_device_overview_data_notice, base::string16());
- EXPECT_EQ(management_device_overview_setup_notice, base::string16());
EXPECT_EQ(management_overview,
l10n_util::GetStringUTF16(IDS_MANAGEMENT_DEVICE_NOT_MANAGED));
EXPECT_FALSE(managed);
diff --git a/components/management_strings.grdp b/components/management_strings.grdp
index 3c2d4c6..5156b468 100644
--- a/components/management_strings.grdp
+++ b/components/management_strings.grdp
@@ -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 -->