Commit 844fd636 authored by Rainhard Findling's avatar Rainhard Findling Committed by Commit Bot

Safety check UI: add "unknown update status"

* For non-Google-based browsers, |VersionUpdater| returns a "updates
  disabled" state. Until now, safety check displayed this as a
  generic error.
* This CL adds a "unknown" updates status, which displays the current
  version of the browser in the safety check update status.
* This CL updates the JS side. The C++ side is updated in
  crrev.com/c/2144038.

Bug: 1015841
Change-Id: Ied9d8cc1b07ba6f12494b2e253a8f7f90e4f3375
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2148778Reviewed-by: default avatarAndrey Zaytsev <andzaytsev@google.com>
Reviewed-by: default avatarEsmael Elmoslimany <aee@chromium.org>
Commit-Queue: Rainhard Findling <rainhard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#759588}
parent 4bd1c8a5
...@@ -39,6 +39,7 @@ cr.define('settings', function() { ...@@ -39,6 +39,7 @@ cr.define('settings', function() {
DISABLED_BY_ADMIN: 4, DISABLED_BY_ADMIN: 4,
FAILED_OFFLINE: 5, FAILED_OFFLINE: 5,
FAILED: 6, FAILED: 6,
UNKNOWN: 7,
}; };
/** /**
......
...@@ -448,6 +448,7 @@ Polymer({ ...@@ -448,6 +448,7 @@ Polymer({
case settings.SafetyCheckUpdatesStatus.RELAUNCH: case settings.SafetyCheckUpdatesStatus.RELAUNCH:
case settings.SafetyCheckUpdatesStatus.DISABLED_BY_ADMIN: case settings.SafetyCheckUpdatesStatus.DISABLED_BY_ADMIN:
case settings.SafetyCheckUpdatesStatus.FAILED_OFFLINE: case settings.SafetyCheckUpdatesStatus.FAILED_OFFLINE:
case settings.SafetyCheckUpdatesStatus.UNKNOWN:
return ChildUiStatus.INFO; return ChildUiStatus.INFO;
case settings.SafetyCheckUpdatesStatus.FAILED: case settings.SafetyCheckUpdatesStatus.FAILED:
return ChildUiStatus.WARNING; return ChildUiStatus.WARNING;
......
...@@ -252,6 +252,14 @@ suite('SafetyCheckUiTests', function() { ...@@ -252,6 +252,14 @@ suite('SafetyCheckUiTests', function() {
assertIconStatusWarning(page.$$('#updatesIcon')); assertIconStatusWarning(page.$$('#updatesIcon'));
}); });
test('updatesUnknownUiTest', function() {
fireSafetyCheckUpdatesEvent(settings.SafetyCheckUpdatesStatus.UNKNOWN);
Polymer.dom.flush();
assertFalse(!!page.$$('#safetyCheckUpdatesButton'));
assertFalse(!!page.$$('#safetyCheckUpdatesManagedIcon'));
assertIconStatusInfo(page.$$('#updatesIcon'));
});
test('passwordsUiTest', function() { test('passwordsUiTest', function() {
// Iterate over all states // Iterate over all states
for (const state of Object.values(settings.SafetyCheckPasswordsStatus)) { for (const state of Object.values(settings.SafetyCheckPasswordsStatus)) {
......
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