commit | 8e3efe11d434e04284f8d646fef14c4fe89c92f5 | [log] [tgz] |
---|---|---|
author | Avery Musbach <[email protected]> | Tue Nov 16 23:52:06 2021 |
committer | Chromium LUCI CQ <[email protected]> | Tue Nov 16 23:52:06 2021 |
tree | 631ff473ecf836377e113c4f7939b440a80f8897 | |
parent | 23829b6a088ff885aae7ffe428eef18413eb7d3f [diff] [blame] |
phone hub: Redo migration from PNG to Lottie This CL is like [1], but with Lottie assets for dark mode whereas [1] has Lottie assets for light mode and that is why I reverted [1]. [1] https://chromium-review.googlesource.com/c/chromium/src/+/3171913 Fixed: 1127996 Test: manual Change-Id: I79bae7d56c7659693a4f68fb079d7d8052d0610d Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3279206 Reviewed-by: Dirk Pranke <[email protected]> Reviewed-by: Scott Violet <[email protected]> Commit-Queue: Avery Musbach <[email protected]> Cr-Commit-Position: refs/heads/main@{#942332}
diff --git a/ash/test/ash_test_suite.cc b/ash/test/ash_test_suite.cc index 93ed86a..ea9d126d 100644 --- a/ash/test/ash_test_suite.cc +++ b/ash/test/ash_test_suite.cc
@@ -16,6 +16,7 @@ #include "ui/display/display_switches.h" #include "ui/gl/gl_switches.h" #include "ui/gl/test/gl_surface_test_support.h" +#include "ui/lottie/resource.h" namespace ash { @@ -40,6 +41,9 @@ // it'll pass regardless of the system language. base::i18n::SetICUDefaultLocale("en_US"); + ui::ResourceBundle::SetParseLottieAsStillImage( + &lottie::ParseLottieAsStillImage); + // Load ash test resources and en-US strings; not 'common' (Chrome) resources. base::FilePath path; base::PathService::Get(base::DIR_MODULE, &path);