GitLab

This partially reverts commit 74d15398 (r292900).

(But we keep a small refactor to make it easier to reorder these buttons
in the future.)

BUG=406222

Review URL: https://codereview.chromium.org/555763002

Cr-Commit-Position: refs/heads/master@{#294062}