Skip to content

GitLab

T
tangled
Commit 74771da1 authored by Yann Dago's avatar Yann Dago Committed by Commit Bot
Browse files
Options

Management WebUI: UI adjustements for desktop 

Unmanaged browser: http://screen/iSGQc3jemSh
Managed browser(no extension, no reporting): http://screen/mBhBmNFFZdm
Local reporting: http://screen/J3TuQiOLKRt
Cloud reporting: http://screen/BPDRCMM7vJP
No Reporting: http://screen/UBDpXm8wgKs
Unknown/incognito domain: http://screen/4gLqBq7xrpi
Dark mode: http://screen/n64k5C6cWfn

Bug: 956561
Change-Id: I7cb4501edce48950e43534616de4caaf716ebb93
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1584884Reviewed-by: default avatarHector Carmona <hcarmona@chromium.org>
Commit-Queue: Yann Dago <ydago@chromium.org>
Cr-Commit-Position: refs/heads/master@{#654705}
parent 90441f63
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 56 deletions
chrome/browser/resources/management/management_browser_proxy.js
View file @ 74771da1
......@@ -44,6 +44,7 @@ management.ManagedInfo;
* deviceManagedInfo: ?management.ManagedInfo,
* extensionReportingTitle: string,
* pageSubtitle: string,
* managed: boolean,
* overview: string,
* }}
*/
......
chrome/browser/resources/management/management_ui.html
View file @ 74771da1
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html">
<link rel="import" href="chrome://resources/cr_elements/cr_icons_css.html">
<link rel="import" href="chrome://resources/cr_elements/cr_toolbar/cr_toolbar.html">
<link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html">
<link rel="import" href="chrome://resources/cr_elements/icons.html">
<link rel="import" href="chrome://resources/cr_elements/shared_style_css.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html">
......@@ -12,9 +14,10 @@
<dom-module id="management-ui">
<template>
<style>
<style include="cr-icons cr-hidden-style">
:host {
@apply --cr-page-host;
color: var(--cr-secondary-text-color);
display: flex;
flex-direction: column;
height: 100%;
......@@ -25,10 +28,6 @@
text-decoration: none;
}
a iron-icon {
color: var(--cr-primary-text-color);
}
cr-toolbar {
flex-shrink: 0;
}
......@@ -54,22 +53,14 @@
align-items: center;
flex-direction: row;
justify-content: start;
padding-bottom: 0;
padding-top: 0;
}
.page-subtitle a {
margin-inline-end: 32px;
}
.page-subtitle iron-icon {
color: var(--cr-title-text-color);
padding-bottom: 0;
padding-top: 0;
min-height: 40px;
padding-bottom: 24px;
padding-top: 6px;
}
.overview-section {
padding-inline-start: 32px;
.page-subtitle cr-icon-button {
margin-inline-end: 10px;
margin-inline-start: -10px;
}
.overview-section div + div {
......@@ -85,7 +76,7 @@
}
th {
font-weight: 400;
font-weight: 500;
}
h2 {
......@@ -104,13 +95,11 @@
section {
@apply --cr-section;
align-items: flex-start;
border-top: none;
flex-direction: column;
justify-content: center;
padding: 24px;
}
section:not(.page-subtitle):not(.overview-section) {
padding-inline-start: 32px;
padding-bottom: 12px;
padding-top: 12px;
}
section:not(.page-subtitle) h2 {
......@@ -135,6 +124,7 @@
table {
border-spacing: 0 16px;
width: 100%;
}
th,
......@@ -151,6 +141,13 @@
width: 40%;
}
.extension-name span {
max-width: 200px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.extension-permissions {
width: 60%;
}
......@@ -176,10 +173,10 @@
<main id="mainContent">
<div class="sections-container">
<div class="card">
<section class="page-subtitle">
<a href="chrome://settings/help" aria-label="$i18n{backButton}">
<iron-icon icon="cr:arrow-back"></iron-icon>
</a>
<section hidden="[[!managed_]]" class="page-subtitle">
<cr-icon-button class="icon-arrow-back" id="closeButton"
on-click="onTapBack_" aria-label="$i18n{backButton}">
</cr-icon-button>
<h2>
[[subtitle_]]
</h2>
......@@ -200,20 +197,15 @@
</li>
<li>[[deviceManagedInfo_.data]]</li>
</ul>
</if>
<div>[[accountManagedInfo_.overview]]</div>
<ul class="overview-messages" hidden="[[!accountManagedInfo_]]">
<if expr="chromeos">
<li>[[accountManagedInfo_.setup]]
<a href="$i18nRaw{managementAccountLearnMoreUrl}"
target="_blank">$i18n{learnMore}</a>
</li>
</if>
<if expr="not chromeos">
<li>[[accountManagedInfo_.setup]]</li>
</if>
<li>[[accountManagedInfo_.data]]</li>
</ul>
</if>
</section>
<if expr="chromeos">
<div hidden="[[!localTrustRoots_]]">
......@@ -242,15 +234,15 @@
</section>
</template>
</if>
<if expr="not chromeos">
<template is="dom-if"
if="[[showBrowserReportingInfo_(browserReportingInfo_)]]">
<section>
<h2>$i18n{browserReporting}</h2>
<div class="subtitle content-indented">
<div class="subtitle">
$i18n{browserReportingExplanation}
</div>
<div class="content-indented">
<div>
<template is="dom-repeat" items="[[browserReportingInfo_]]">
<div class="report">
<iron-icon icon="[[item.icon]]"></iron-icon>
......@@ -265,11 +257,12 @@
</div>
</section>
</template>
</if>
<template is="dom-if"
if="[[showExtensionReportingInfo_(extensions_)]]">
<section>
<section class="extension-reporting">
<h2>$i18n{extensionReporting}</h2>
<div class="subtitle content-indented">
<div class="subtitle">
[[extensionReportingSubtitle_]]
</div>
<table class="content-indented">
......@@ -282,8 +275,8 @@
<template is="dom-repeat" items="[[extensions_]]">
<tr>
<td class="extension-name">
<div>
<img src="[[item.icon]]" alt="">
<div title="[[item.name]]" role="presentation">
<img src="[[item.icon]]" alt="" aria-hidden="true">
<span>[[item.name]]</span>
</div>
</td>
......
chrome/browser/resources/management/management_ui.js
View file @ 74771da1
......@@ -63,6 +63,9 @@ Polymer({
managementNoticeHtml_: String,
// </if>
/** @private */
managed_: Boolean,
/** @private */
extensionReportingSubtitle_: String,
},
......@@ -235,9 +238,15 @@ Polymer({
`chrome://settings?search=${encodeURIComponent(query)}`;
},
/** @private */
onTapBack_() {
window.location.href = `chrome://settings/help`;
},
/** @private */
updateManagedFields_() {
this.browserProxy_.getContextualManagedData().then(data => {
this.managed_ = data.managed;
this.extensionReportingSubtitle_ = data.extensionReportingTitle;
this.subtitle_ = data.pageSubtitle;
this.accountManagedInfo_ = data.accountManagedInfo;
......
chrome/browser/ui/webui/management_ui_handler.cc
View file @ 74771da1
......@@ -559,6 +559,7 @@ base::DictionaryValue ManagementUIHandler::GetContextualManagedData(
l10n_util::GetStringUTF16(device_type)));
#endif // !defined(OS_CHROMEOS)
}
response.SetBoolean("managed", managed_);
GetManagementStatus(profile, &response);
return response;
}
......
chrome/browser/ui/webui/management_ui_handler_unittest.cc
View file @ 74771da1
......@@ -39,6 +39,7 @@ struct ContextualManagementSourceUpdate {
base::string16* management_overview;
base::string16* management_overview_data_notice;
base::string16* management_overview_setup_notice;
bool* managed;
};
class TestManagementUIHandler : public ManagementUIHandler {
......@@ -106,6 +107,7 @@ class ManagementUIHandlerTests : public testing::Test {
extracted.management_overview_data_notice);
data.GetString("accountManagedInfo.setup",
extracted.management_overview_setup_notice);
data.GetBoolean("managed", extracted.managed);
}
protected:
......@@ -126,18 +128,20 @@ TEST_F(ManagementUIHandlerTests,
base::string16 management_overview;
base::string16 management_overview_data_notice;
base::string16 management_overview_setup_notice;
bool managed;
ContextualManagementSourceUpdate extracted{&extension_reporting_title,
&browser_management_notice,
&subtitle,
&management_overview,
&management_overview_data_notice,
&management_overview_setup_notice};
&management_overview_setup_notice,
&managed};
handler_.SetManagedForTesting(false);
auto data = handler_.GetContextualManagedDataForTesting(profile.get());
ExtractContextualSourceUpdate(data, extracted);
EXPECT_EQ(data.DictSize(), 3u);
EXPECT_EQ(data.DictSize(), 4u);
EXPECT_EQ(extension_reporting_title,
l10n_util::GetStringUTF16(IDS_MANAGEMENT_EXTENSIONS_INSTALLED));
EXPECT_EQ(browser_management_notice,
......@@ -161,18 +165,20 @@ TEST_F(ManagementUIHandlerTests,
base::string16 management_overview;
base::string16 management_overview_data_notice;
base::string16 management_overview_setup_notice;
bool managed;
ContextualManagementSourceUpdate extracted{&extension_reporting_title,
&browser_management_notice,
&subtitle,
&management_overview,
&management_overview_data_notice,
&management_overview_setup_notice};
&management_overview_setup_notice,
&managed};
handler_.SetManagedForTesting(true);
auto data = handler_.GetContextualManagedDataForTesting(profile.get());
ExtractContextualSourceUpdate(data, extracted);
EXPECT_EQ(data.DictSize(), 4u);
EXPECT_EQ(data.DictSize(), 5u);
EXPECT_EQ(extension_reporting_title,
l10n_util::GetStringUTF16(IDS_MANAGEMENT_EXTENSIONS_INSTALLED));
EXPECT_EQ(browser_management_notice,
......@@ -187,6 +193,7 @@ TEST_F(ManagementUIHandlerTests,
l10n_util::GetStringUTF16(IDS_MANAGEMENT_ACCOUNT_MANAGED_DATA));
EXPECT_EQ(management_overview_setup_notice,
l10n_util::GetStringUTF16(IDS_MANAGEMENT_ACCOUNT_MANAGED_SETUP));
EXPECT_TRUE(managed);
}
TEST_F(ManagementUIHandlerTests,
......@@ -201,18 +208,20 @@ TEST_F(ManagementUIHandlerTests,
base::string16 management_overview;
base::string16 management_overview_data_notice;
base::string16 management_overview_setup_notice;
bool managed;
ContextualManagementSourceUpdate extracted{&extensions_installed,
&browser_management_notice,
&subtitle,
&management_overview,
&management_overview_data_notice,
&management_overview_setup_notice};
&management_overview_setup_notice,
&managed};
handler_.SetManagedForTesting(true);
auto data = handler_.GetContextualManagedDataForTesting(profile.get());
ExtractContextualSourceUpdate(data, extracted);
EXPECT_EQ(data.DictSize(), 4u);
EXPECT_EQ(data.DictSize(), 5u);
EXPECT_EQ(extensions_installed,
l10n_util::GetStringUTF16(IDS_MANAGEMENT_EXTENSIONS_INSTALLED));
EXPECT_EQ(browser_management_notice,
......@@ -227,6 +236,7 @@ TEST_F(ManagementUIHandlerTests,
l10n_util::GetStringUTF16(IDS_MANAGEMENT_ACCOUNT_MANAGED_DATA));
EXPECT_EQ(management_overview_setup_notice,
l10n_util::GetStringUTF16(IDS_MANAGEMENT_ACCOUNT_MANAGED_SETUP));
EXPECT_TRUE(managed);
}
TEST_F(ManagementUIHandlerTests,
......@@ -241,19 +251,21 @@ TEST_F(ManagementUIHandlerTests,
base::string16 management_overview;
base::string16 management_overview_data_notice;
base::string16 management_overview_setup_notice;
bool managed;
ContextualManagementSourceUpdate extracted{&extension_reporting_title,
&browser_management_notice,
&subtitle,
&management_overview,
&management_overview_data_notice,
&management_overview_setup_notice};
&management_overview_setup_notice,
&managed};
handler_.SetManagedForTesting(false);
auto data = handler_.GetContextualManagedDataForTesting(profile.get());
ExtractContextualSourceUpdate(data, extracted);
EXPECT_EQ(data.DictSize(), 3u);
EXPECT_EQ(data.DictSize(), 4u);
EXPECT_EQ(extension_reporting_title,
l10n_util::GetStringFUTF16(IDS_MANAGEMENT_EXTENSIONS_INSTALLED_BY,
base::UTF8ToUTF16("manager.com")));
......@@ -266,6 +278,7 @@ TEST_F(ManagementUIHandlerTests,
EXPECT_EQ(management_overview, base::string16());
EXPECT_EQ(management_overview_data_notice, base::string16());
EXPECT_EQ(management_overview_setup_notice, base::string16());
EXPECT_FALSE(managed);
}
TEST_F(ManagementUIHandlerTests,
......@@ -280,19 +293,21 @@ TEST_F(ManagementUIHandlerTests,
base::string16 management_overview;
base::string16 management_overview_data_notice;
base::string16 management_overview_setup_notice;
bool managed;
ContextualManagementSourceUpdate extracted{&extension_reporting_title,
&browser_management_notice,
&subtitle,
&management_overview,
&management_overview_data_notice,
&management_overview_setup_notice};
&management_overview_setup_notice,
&managed};
handler_.SetManagedForTesting(false);
auto data = handler_.GetContextualManagedDataForTesting(profile.get());
ExtractContextualSourceUpdate(data, extracted);
EXPECT_EQ(data.DictSize(), 3u);
EXPECT_EQ(data.DictSize(), 4u);
EXPECT_EQ(extension_reporting_title,
l10n_util::GetStringUTF16(IDS_MANAGEMENT_EXTENSIONS_INSTALLED));
EXPECT_EQ(browser_management_notice,
......@@ -304,6 +319,7 @@ TEST_F(ManagementUIHandlerTests,
EXPECT_EQ(management_overview, base::string16());
EXPECT_EQ(management_overview_data_notice, base::string16());
EXPECT_EQ(management_overview_setup_notice, base::string16());
EXPECT_FALSE(managed);
}
TEST_F(ManagementUIHandlerTests,
......@@ -318,18 +334,20 @@ TEST_F(ManagementUIHandlerTests,
base::string16 management_overview;
base::string16 management_overview_data_notice;
base::string16 management_overview_setup_notice;
bool managed;
ContextualManagementSourceUpdate extracted{&extension_reporting_title,
&browser_management_notice,
&subtitle,
&management_overview,
&management_overview_data_notice,
&management_overview_setup_notice};
&management_overview_setup_notice,
&managed};
handler_.SetManagedForTesting(true);
auto data = handler_.GetContextualManagedDataForTesting(profile.get());
ExtractContextualSourceUpdate(data, extracted);
EXPECT_EQ(data.DictSize(), 4u);
EXPECT_EQ(data.DictSize(), 5u);
EXPECT_EQ(extension_reporting_title,
l10n_util::GetStringFUTF16(IDS_MANAGEMENT_EXTENSIONS_INSTALLED_BY,
base::UTF8ToUTF16("manager.com")));
......@@ -349,6 +367,7 @@ TEST_F(ManagementUIHandlerTests,
l10n_util::GetStringUTF16(IDS_MANAGEMENT_ACCOUNT_MANAGED_DATA));
EXPECT_EQ(management_overview_setup_notice,
l10n_util::GetStringUTF16(IDS_MANAGEMENT_ACCOUNT_MANAGED_SETUP));
EXPECT_TRUE(managed);
}
#endif // !defined(OS_CHROMEOS)
......@@ -367,12 +386,14 @@ TEST_F(ManagementUIHandlerTests,
base::string16 management_overview;
base::string16 management_overview_data_notice;
base::string16 management_overview_setup_notice;
bool managed;
ContextualManagementSourceUpdate extracted{&extensions_installed,
&browser_management_notice,
&subtitle,
&management_overview,
&management_overview_data_notice,
&management_overview_setup_notice};
&management_overview_setup_notice,
&managed};
handler_.SetManagedForTesting(true);
auto data = handler_.GetContextualManagedDataForTesting(profile.get());
......@@ -382,6 +403,7 @@ TEST_F(ManagementUIHandlerTests,
l10n_util::GetStringFUTF16(IDS_MANAGEMENT_SUBTITLE_MANAGED_BY,
l10n_util::GetStringUTF16(device_type),
base::UTF8ToUTF16("manager.com")));
EXPECT_TRUE(managed);
}
TEST_F(ManagementUIHandlerTests, ManagementContextualSourceUpdateUnmanaged) {
......@@ -394,12 +416,14 @@ TEST_F(ManagementUIHandlerTests, ManagementContextualSourceUpdateUnmanaged) {
base::string16 management_overview;
base::string16 management_overview_data_notice;
base::string16 management_overview_setup_notice;
bool managed;
ContextualManagementSourceUpdate extracted{&extension_reporting_title,
&browser_management_notice,
&subtitle,
&management_overview,
&management_overview_data_notice,
&management_overview_setup_notice};
&management_overview_setup_notice,
&managed};
handler_.SetManagedForTesting(false);
auto data = handler_.GetContextualManagedDataForTesting(profile.get());
......@@ -407,6 +431,7 @@ TEST_F(ManagementUIHandlerTests, ManagementContextualSourceUpdateUnmanaged) {
EXPECT_EQ(subtitle,
l10n_util::GetStringFUTF16(IDS_MANAGEMENT_NOT_MANAGED_SUBTITLE,
l10n_util::GetStringUTF16(device_type)));
EXPECT_FALSE(managed);
}
#endif
......
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