Remove flattenhtml=true usage from about_conflicts.html.
It was previously inlining ui/webui/resources/images/warning.svg, but
this image does not appear to be used anywhere else so it can be moved
under chrome://conflicts and served from there, eliminating the need to
inline.
Bug: 1152343
Change-Id: If3b55c595b1cdacebbe068abf3fe452f5c6f5846
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3652701
Auto-Submit: Demetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1007955}
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 5c3a2ea7f..e79aacf 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -23,8 +23,9 @@
</structures>
<includes>
<if expr="is_win">
- <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\conflicts\about_conflicts.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
+ <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\conflicts\about_conflicts.html" type="BINDATA" />
<include name="IDR_ABOUT_CONFLICTS_JS" file="resources\conflicts\about_conflicts.js" type="BINDATA" />
+ <include name="IDR_ABOUT_CONFLICTS_WARNING_SVG" file="resources\conflicts\warning.svg" type="BINDATA" />
</if>
<if expr="enable_nacl or is_macosx">
<!-- On Mac, the NaCl page resources need to be included in the build, regardless of whether chrome://nacl is available at runtime, because x86_64 and arm64 builds need to have identical pak files, https://crbug.com/1318358. -->
diff --git a/chrome/browser/resources/conflicts/about_conflicts.html b/chrome/browser/resources/conflicts/about_conflicts.html
index 2904989..2723032 100644
--- a/chrome/browser/resources/conflicts/about_conflicts.html
+++ b/chrome/browser/resources/conflicts/about_conflicts.html
@@ -27,8 +27,7 @@
}
#header {
- background: url(../../../../ui/webui/resources/images/warning.svg)
- left center / 48px no-repeat;
+ background: url(./warning.svg) left center / 48px no-repeat;
box-sizing: border-box;
margin-bottom: 1.05em;
overflow: hidden;
diff --git a/ui/webui/resources/images/warning.svg b/chrome/browser/resources/conflicts/warning.svg
similarity index 100%
rename from ui/webui/resources/images/warning.svg
rename to chrome/browser/resources/conflicts/warning.svg
diff --git a/chrome/browser/ui/webui/conflicts/conflicts_ui.cc b/chrome/browser/ui/webui/conflicts/conflicts_ui.cc
index 89d1202f..368b5b5 100644
--- a/chrome/browser/ui/webui/conflicts/conflicts_ui.cc
+++ b/chrome/browser/ui/webui/conflicts/conflicts_ui.cc
@@ -32,6 +32,7 @@
"trusted-types jstemplate;");
source->AddResourcePath("conflicts.js", IDR_ABOUT_CONFLICTS_JS);
+ source->AddResourcePath("warning.svg", IDR_ABOUT_CONFLICTS_WARNING_SVG);
source->SetDefaultResource(IDR_ABOUT_CONFLICTS_HTML);
return source;
}
