diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/chrome/browser/resources/management | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/chrome/browser/resources/management')
3 files changed, 5 insertions, 2 deletions
diff --git a/chromium/chrome/browser/resources/management/management_browser_proxy.js b/chromium/chrome/browser/resources/management/management_browser_proxy.js index cf4a5a30586..4510d679e01 100644 --- a/chromium/chrome/browser/resources/management/management_browser_proxy.js +++ b/chromium/chrome/browser/resources/management/management_browser_proxy.js @@ -69,6 +69,7 @@ export const DeviceReportingType = { STATISTIC: 'device statistics', DEVICE: 'device', CRASH_REPORT: 'crash report', + APP_INFO_AND_ACTIVITY: 'app info and activity', LOGS: 'logs', PRINT: 'print', CROSTINI: 'crostini', diff --git a/chromium/chrome/browser/resources/management/management_ui.html b/chromium/chrome/browser/resources/management/management_ui.html index 0cb46863ce2..f2f414ce0e3 100644 --- a/chromium/chrome/browser/resources/management/management_ui.html +++ b/chromium/chrome/browser/resources/management/management_ui.html @@ -195,9 +195,9 @@ </div> <table class="content-indented"> <tr> - <th class="protection-name">$i18n{extensionName}</th> + <th class="protection-name">$i18n{connectorEvent}</th> <th class="protection-permissions"> - $i18n{extensionPermissions} + $i18n{connectorVisibleData} </th> </tr> <template is="dom-repeat" diff --git a/chromium/chrome/browser/resources/management/management_ui.js b/chromium/chrome/browser/resources/management/management_ui.js index 765261447a9..b928315c798 100644 --- a/chromium/chrome/browser/resources/management/management_ui.js +++ b/chromium/chrome/browser/resources/management/management_ui.js @@ -221,6 +221,8 @@ Polymer({ return 'cr:computer'; case DeviceReportingType.CRASH_REPORT: return 'management:crash'; + case DeviceReportingType.APP_INFO_AND_ACTIVITY: + return 'management:timelapse'; case DeviceReportingType.LOGS: return 'management:report'; case DeviceReportingType.PRINT: |