GitLab

* Use temps to replace repeated expressions.
* Change name to make clear that it's not always the warning icon.
* Return ImageModel so callers can use the size; this fixes a bug where
  callsites used the wrong size in cases where the "help or error icon"
  would have been painted.  This removes GetWarningIconSize().

This does not yet fix a couple of behavioral oddities around the
selection of icons and colors (didn't want to mix noticeable behavior
changes with cleanup).  I will do that in a subsequent CL.

Bug: none
Change-Id: I44d5e56ea3729b2bc7c6498cbf32f342068ad77e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2315218
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791368}