GitLab

Some error states are best resolved by trying again, so add that
message to those error strings.

On error, replace the white "Cancel" button with a blue "Close" button
to help indicate that the process is finished and closing the dialog
is the only way forward.

Also update the info string on the discovery page.

Bug: 1148581
Change-Id: Id8070de2fdc59a56a7d83d2196bc288452e558b7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2570337
Commit-Queue: Curt Clemens <cclem@google.com>
Reviewed-by: James Vecore <vecore@google.com>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#834525}