The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/25b9be07c588fa6b1cd35f42e8f2e0b5f64268b6

commit 25b9be07c588fa6b1cd35f42e8f2e0b5f64268b6
Author: Marton Hunyady <hunyadym@chromium.org>
Date: Wed Jul 18 11:20:29 2018

Notify the user that powerwash is required when rolling back.

Change the update notification text to notify the user that the device
will wipe itself when it's rebooted.

Currently, this is done by comparing the version number of the current
and the new Chrome OS image. We're planning to later change this to an
actual DBus call to update_engine, which will return true exactly when
a powerwash will happen.

There will also be a follow-up CL which will change the notification
text to a rollback-specific one (currently it says "Update available").

Bug:  863088 
Change-Id: Ic92444b0520f9e3e7f4e9f8a736abe6f6af20913
Reviewed-on: https://chromium-review.googlesource.com/1140320
Commit-Queue: Marton Hunyady <hunyadym@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Dan Erat <derat@chromium.org>
Cr-Commit-Position: refs/heads/master@{#576000}
[modify] https://crrev.com/25b9be07c588fa6b1cd35f42e8f2e0b5f64268b6/chrome/browser/chromeos/upgrade_detector_chromeos.cc
[modify] https://crrev.com/25b9be07c588fa6b1cd35f42e8f2e0b5f64268b6/chromeos/dbus/update_engine_client.cc
[modify] https://crrev.com/25b9be07c588fa6b1cd35f42e8f2e0b5f64268b6/chromeos/dbus/update_engine_client.h
[modify] https://crrev.com/25b9be07c588fa6b1cd35f42e8f2e0b5f64268b6/chromeos/system/version_loader.cc
[modify] https://crrev.com/25b9be07c588fa6b1cd35f42e8f2e0b5f64268b6/chromeos/system/version_loader.h
[modify] https://crrev.com/25b9be07c588fa6b1cd35f42e8f2e0b5f64268b6/chromeos/system/version_loader_unittest.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/37ecdebd9e75250e2f574207619ae196e71119fc

commit 37ecdebd9e75250e2f574207619ae196e71119fc
Author: Marton Hunyady <hunyadym@chromium.org>
Date: Fri Jul 20 18:10:07 2018

Show rollback-specific strings for users during/after rollback happens

Change text on the update screen:
- During rollback:
    "Your administrator is rolling back this device (25%)"
    https://screenshot.googleplex.com/WrMrGxdOU86.png
- After rollback:
    "Your administrator rolled back this device. Please save important
     files, then restart. All data on the device will be deleted."
- Button text:
    "Restart and reset"
    https://screenshot.googleplex.com/Zq2QsMTXUdt.png

Change text of the notification:
- https://screenshot.googleplex.com/vVdBEHcKzKR.png
- Title:
    "Device will be rolled back"
- Text:
    "Your administrator is rolling back your device. All data will be
     deleted when the device is restarted."
- Button:
    "Restart and reset"

Notification is also shown at warning level.

Bug:  863088 
Change-Id: I99cd590fee90d7ac1ad5927b3459f9cb97a051a1
Reviewed-on: https://chromium-review.googlesource.com/1143481
Commit-Queue: Marton Hunyady <hunyadym@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#576922}
[modify] https://crrev.com/37ecdebd9e75250e2f574207619ae196e71119fc/ash/ash_strings.grd
[modify] https://crrev.com/37ecdebd9e75250e2f574207619ae196e71119fc/ash/public/interfaces/system_tray.mojom
[modify] https://crrev.com/37ecdebd9e75250e2f574207619ae196e71119fc/ash/system/model/system_tray_model.cc
[modify] https://crrev.com/37ecdebd9e75250e2f574207619ae196e71119fc/ash/system/model/system_tray_model.h
[modify] https://crrev.com/37ecdebd9e75250e2f574207619ae196e71119fc/ash/system/model/update_model.cc
[modify] https://crrev.com/37ecdebd9e75250e2f574207619ae196e71119fc/ash/system/model/update_model.h
[modify] https://crrev.com/37ecdebd9e75250e2f574207619ae196e71119fc/ash/system/update/tray_update_unittest.cc
[modify] https://crrev.com/37ecdebd9e75250e2f574207619ae196e71119fc/ash/system/update/update_notification_controller.cc
[modify] https://crrev.com/37ecdebd9e75250e2f574207619ae196e71119fc/ash/system/update/update_notification_controller_unittest.cc
[modify] https://crrev.com/37ecdebd9e75250e2f574207619ae196e71119fc/chrome/app/settings_strings.grdp
[modify] https://crrev.com/37ecdebd9e75250e2f574207619ae196e71119fc/chrome/browser/chromeos/upgrade_detector_chromeos.cc
[modify] https://crrev.com/37ecdebd9e75250e2f574207619ae196e71119fc/chrome/browser/resources/settings/about_page/about_page.js
[modify] https://crrev.com/37ecdebd9e75250e2f574207619ae196e71119fc/chrome/browser/ui/ash/system_tray_client.cc
[modify] https://crrev.com/37ecdebd9e75250e2f574207619ae196e71119fc/chrome/browser/ui/webui/help/version_updater.h
[modify] https://crrev.com/37ecdebd9e75250e2f574207619ae196e71119fc/chrome/browser/ui/webui/help/version_updater_basic.cc
[modify] https://crrev.com/37ecdebd9e75250e2f574207619ae196e71119fc/chrome/browser/ui/webui/help/version_updater_chromeos.cc
[modify] https://crrev.com/37ecdebd9e75250e2f574207619ae196e71119fc/chrome/browser/ui/webui/help/version_updater_chromeos_unittest.cc
[modify] https://crrev.com/37ecdebd9e75250e2f574207619ae196e71119fc/chrome/browser/ui/webui/help/version_updater_mac.mm
[modify] https://crrev.com/37ecdebd9e75250e2f574207619ae196e71119fc/chrome/browser/ui/webui/help/version_updater_win.cc
[modify] https://crrev.com/37ecdebd9e75250e2f574207619ae196e71119fc/chrome/browser/ui/webui/settings/about_handler.cc
[modify] https://crrev.com/37ecdebd9e75250e2f574207619ae196e71119fc/chrome/browser/ui/webui/settings/about_handler.h
[modify] https://crrev.com/37ecdebd9e75250e2f574207619ae196e71119fc/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
[modify] https://crrev.com/37ecdebd9e75250e2f574207619ae196e71119fc/chrome/browser/upgrade_detector.h

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/6903524ac4cee6aeb574d4fcb40f771174ba3ddc

commit 6903524ac4cee6aeb574d4fcb40f771174ba3ddc
Author: Marton Hunyady <hunyadym@chromium.org>
Date: Fri Jul 20 22:57:03 2018

Add rollback icon for rollback notification

Add a new rollback icon (vertically flipped update icon) and use it in
the rollback notification.

Screenshot: https://screenshot.googleplex.com/UebqEykm9P7.png

Bug:  863088 
Change-Id: I45dea5daac43469349a0cccd166a6338532ce55f
Reviewed-on: https://chromium-review.googlesource.com/1145071
Reviewed-by: Jenny Zhang <jennyz@chromium.org>
Reviewed-by: Evan Stade <estade@chromium.org>
Reviewed-by: Zentaro Kavanagh <zentaro@chromium.org>
Commit-Queue: Marton Hunyady <hunyadym@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577023}
[modify] https://crrev.com/6903524ac4cee6aeb574d4fcb40f771174ba3ddc/ash/resources/vector_icons/BUILD.gn
[add] https://crrev.com/6903524ac4cee6aeb574d4fcb40f771174ba3ddc/ash/resources/vector_icons/system_menu_rollback.icon
[modify] https://crrev.com/6903524ac4cee6aeb574d4fcb40f771174ba3ddc/ash/system/update/update_notification_controller.cc

This bug requires manual review: There is .grd file changes and we are only 44 days from stable.
Please contact the milestone owner if you have questions.
Owners: amineer@(Android), kariahda@(iOS), cindyb@(ChromeOS), govind@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

Hi, reviewing merge request. Has this been successfully tested on ToT, on multiple devices?

Yes, I tested it on soraka and caroline, Chrome OS 70.0.3501.0.

Thank you. Merge approved M69.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/e205a8d8bbc499e6af382cd172b168905f753445

commit e205a8d8bbc499e6af382cd172b168905f753445
Author: Marton Hunyady <hunyadym@chromium.org>
Date: Thu Jul 26 17:31:28 2018

Show rollback-specific strings for users during/after rollback happens

Change text on the update screen:
- During rollback:
    "Your administrator is rolling back this device (25%)"
    https://screenshot.googleplex.com/WrMrGxdOU86.png
- After rollback:
    "Your administrator rolled back this device. Please save important
     files, then restart. All data on the device will be deleted."
- Button text:
    "Restart and reset"
    https://screenshot.googleplex.com/Zq2QsMTXUdt.png

Change text of the notification:
- https://screenshot.googleplex.com/vVdBEHcKzKR.png
- Title:
    "Device will be rolled back"
- Text:
    "Your administrator is rolling back your device. All data will be
     deleted when the device is restarted."
- Button:
    "Restart and reset"

Notification is also shown at warning level.

Bug:  863088 
Change-Id: I99cd590fee90d7ac1ad5927b3459f9cb97a051a1
Reviewed-on: https://chromium-review.googlesource.com/1143481
Commit-Queue: Marton Hunyady <hunyadym@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#576922}(cherry picked from commit 37ecdebd9e75250e2f574207619ae196e71119fc)
Reviewed-on: https://chromium-review.googlesource.com/1151408
Reviewed-by: Marton Hunyady <hunyadym@chromium.org>
Cr-Commit-Position: refs/branch-heads/3497@{#116}
Cr-Branched-From: 271eaf50594eb818c9295dc78d364aea18c82ea8-refs/heads/master@{#576753}
[modify] https://crrev.com/e205a8d8bbc499e6af382cd172b168905f753445/ash/ash_strings.grd
[modify] https://crrev.com/e205a8d8bbc499e6af382cd172b168905f753445/ash/public/interfaces/system_tray.mojom
[modify] https://crrev.com/e205a8d8bbc499e6af382cd172b168905f753445/ash/system/model/system_tray_model.cc
[modify] https://crrev.com/e205a8d8bbc499e6af382cd172b168905f753445/ash/system/model/system_tray_model.h
[modify] https://crrev.com/e205a8d8bbc499e6af382cd172b168905f753445/ash/system/model/update_model.cc
[modify] https://crrev.com/e205a8d8bbc499e6af382cd172b168905f753445/ash/system/model/update_model.h
[modify] https://crrev.com/e205a8d8bbc499e6af382cd172b168905f753445/ash/system/update/tray_update_unittest.cc
[modify] https://crrev.com/e205a8d8bbc499e6af382cd172b168905f753445/ash/system/update/update_notification_controller.cc
[modify] https://crrev.com/e205a8d8bbc499e6af382cd172b168905f753445/ash/system/update/update_notification_controller_unittest.cc
[modify] https://crrev.com/e205a8d8bbc499e6af382cd172b168905f753445/chrome/app/settings_strings.grdp
[modify] https://crrev.com/e205a8d8bbc499e6af382cd172b168905f753445/chrome/browser/chromeos/upgrade_detector_chromeos.cc
[modify] https://crrev.com/e205a8d8bbc499e6af382cd172b168905f753445/chrome/browser/resources/settings/about_page/about_page.js
[modify] https://crrev.com/e205a8d8bbc499e6af382cd172b168905f753445/chrome/browser/ui/ash/system_tray_client.cc
[modify] https://crrev.com/e205a8d8bbc499e6af382cd172b168905f753445/chrome/browser/ui/webui/help/version_updater.h
[modify] https://crrev.com/e205a8d8bbc499e6af382cd172b168905f753445/chrome/browser/ui/webui/help/version_updater_basic.cc
[modify] https://crrev.com/e205a8d8bbc499e6af382cd172b168905f753445/chrome/browser/ui/webui/help/version_updater_chromeos.cc
[modify] https://crrev.com/e205a8d8bbc499e6af382cd172b168905f753445/chrome/browser/ui/webui/help/version_updater_chromeos_unittest.cc
[modify] https://crrev.com/e205a8d8bbc499e6af382cd172b168905f753445/chrome/browser/ui/webui/help/version_updater_mac.mm
[modify] https://crrev.com/e205a8d8bbc499e6af382cd172b168905f753445/chrome/browser/ui/webui/help/version_updater_win.cc
[modify] https://crrev.com/e205a8d8bbc499e6af382cd172b168905f753445/chrome/browser/ui/webui/settings/about_handler.cc
[modify] https://crrev.com/e205a8d8bbc499e6af382cd172b168905f753445/chrome/browser/ui/webui/settings/about_handler.h
[modify] https://crrev.com/e205a8d8bbc499e6af382cd172b168905f753445/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
[modify] https://crrev.com/e205a8d8bbc499e6af382cd172b168905f753445/chrome/browser/upgrade_detector.h

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/e1f0a7a4dc901abd5bde16f21f358ab4747d40f0

commit e1f0a7a4dc901abd5bde16f21f358ab4747d40f0
Author: Marton Hunyady <hunyadym@chromium.org>
Date: Thu Jul 26 17:32:41 2018

Add rollback icon for rollback notification

Add a new rollback icon (vertically flipped update icon) and use it in
the rollback notification.

Screenshot: https://screenshot.googleplex.com/UebqEykm9P7.png

Bug:  863088 
Change-Id: I45dea5daac43469349a0cccd166a6338532ce55f
Reviewed-on: https://chromium-review.googlesource.com/1145071
Reviewed-by: Jenny Zhang <jennyz@chromium.org>
Reviewed-by: Evan Stade <estade@chromium.org>
Reviewed-by: Zentaro Kavanagh <zentaro@chromium.org>
Commit-Queue: Marton Hunyady <hunyadym@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#577023}(cherry picked from commit 6903524ac4cee6aeb574d4fcb40f771174ba3ddc)
Reviewed-on: https://chromium-review.googlesource.com/1151727
Reviewed-by: Marton Hunyady <hunyadym@chromium.org>
Cr-Commit-Position: refs/branch-heads/3497@{#117}
Cr-Branched-From: 271eaf50594eb818c9295dc78d364aea18c82ea8-refs/heads/master@{#576753}
[modify] https://crrev.com/e1f0a7a4dc901abd5bde16f21f358ab4747d40f0/ash/resources/vector_icons/BUILD.gn
[add] https://crrev.com/e1f0a7a4dc901abd5bde16f21f358ab4747d40f0/ash/resources/vector_icons/system_menu_rollback.icon
[modify] https://crrev.com/e1f0a7a4dc901abd5bde16f21f358ab4747d40f0/ash/system/update/update_notification_controller.cc