WebUI: Move shared button_butter_bar_* png images to the Feedback app.

These images currently reside in shared WebUI code under
ui/webui/resources/images/, but they are only used by the Feedback app.

Also removing flattenhtml="true" from feedback/html/default.html since
it is not actually needed.

Bug: 1132403
Change-Id: I76fc062a7e57742faf5ee6068a9fc052e46fd2d0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2528208Reviewed-by: Miriam Zimmerman <mutexlox@chromium.org>
Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Auto-Submit: dpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825944}

chrome/browser/resources/component_extension_resources.grd

@@ -40,7 +40,7 @@
       <if expr="not is_android">
         <include name="IDR_FEEDBACK_BLUETOOTHLOGSINFO_HTML" file="feedback/html/bluetooth_logs_info.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
         <include name="IDR_FEEDBACK_ASSISTANTLOGSINFO_HTML" file="feedback/html/assistant_logs_info.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
-        <include name="IDR_FEEDBACK_DEFAULT_HTML" file="feedback/html/default.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
+        <include name="IDR_FEEDBACK_DEFAULT_HTML" file="feedback/html/default.html" preprocess="true" type="BINDATA" />
         <include name="IDR_FEEDBACK_SYSINFO_HTML" file="feedback/html/sys_info.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
         <include name="IDR_FEEDBACK_ASSISTANT_LOGS_INFO_JS" file="feedback/js/assistant_logs_info.js" flattenhtml="true" type="BINDATA" />
         <include name="IDR_FEEDBACK_FEEDBACK_UTIL_JS" file="feedback/js/feedback_util.js" flattenhtml="true" type="BINDATA" />
@@ -54,6 +54,18 @@
         <include name="IDR_FEEDBACK_SYSINFO_CSS" file="feedback/css/sys_info.css" type="BINDATA" />
         <include name="IDR_FEEDBACK_ICON_48" file="feedback/images/icon48.png" type="BINDATA" />
         <include name="IDR_FEEDBACK_ICON_192" file="feedback/images/icon192.png" type="BINDATA" />
+        <include name="IDR_FEEDBACK_BUTTON_BUTTER_BAR_CLOSE_PNG"
+                 file="feedback/images/button_butter_bar_close.png" type="BINDATA" />
+        <include name="IDR_FEEDBACK_BUTTON_BUTTER_BAR_CLOSE_HOVER_PNG"
+                 file="feedback/images/button_butter_bar_close_hover.png" type="BINDATA" />
+        <include name="IDR_FEEDBACK_BUTTON_BUTTER_BAR_CLOSE_PRESSED_PNG"
+                 file="feedback/images/button_butter_bar_close_pressed.png" type="BINDATA" />
+        <include name="IDR_FEEDBACK_BUTTON_BUTTER_BAR_CLOSE_2X_PNG"
+                 file="feedback/images/2x/button_butter_bar_close.png" type="BINDATA" />
+        <include name="IDR_FEEDBACK_BUTTON_BUTTER_BAR_CLOSE_HOVER_2X_PNG"
+                 file="feedback/images/2x/button_butter_bar_close_hover.png" type="BINDATA" />
+        <include name="IDR_FEEDBACK_BUTTON_BUTTER_BAR_CLOSE_PRESSED_2X_PNG"
+                 file="feedback/images/2x/button_butter_bar_close_pressed.png" type="BINDATA" />
       </if>
       <include name="IDR_IDENTITY_API_SCOPE_APPROVAL_BACKGROUND_JS" file="identity_scope_approval_dialog/background.js" type="BINDATA" />
       <include name="IDR_IDENTITY_API_SCOPE_APPROVAL_DIALOG_CSS" file="identity_scope_approval_dialog/scope_approval_dialog.css" type="BINDATA" />

chrome/browser/resources/feedback/css/feedback.css

@@ -194,8 +194,8 @@ body {
 .content .remove-file-button {
   background-color: transparent;
   background-image: -webkit-image-set(
-      url(chrome://resources/images/apps/button_butter_bar_close.png) 1x,
-      url(chrome://resources/images/2x/apps/button_butter_bar_close.png) 2x);
+      url(../images/button_butter_bar_close.png) 1x,
+      url(../images/2x/button_butter_bar_close.png) 2x);
   background-position: 50% 80%;
   background-repeat: no-repeat;
   border: none;
@@ -207,14 +207,14 @@ body {
 
 .content .remove-file-button:hover {
   background-image: -webkit-image-set(
-      url(chrome://resources/images/apps/button_butter_bar_close_hover.png) 1x,
-      url(chrome://resources/images/2x/apps/button_butter_bar_close_hover.png) 2x);
+      url(../images/button_butter_bar_close_hover.png) 1x,
+      url(../images/2x/button_butter_bar_close_hover.png) 2x);
 }
 
 .content .remove-file-button:active {
   background-image: -webkit-image-set(
-      url(chrome://resources/images/apps/button_butter_bar_close_pressed.png) 1x,
-      url(chrome://resources/images/2x/apps/button_butter_bar_close_pressed.png) 2x);
+      url(../images/button_butter_bar_close_pressed.png) 1x,
+      url(../images/2x/button_butter_bar_close_pressed.png) 2x);
 }
 
 .content #attach-file-note {

ui/webui/resources/webui_resources.grd

@@ -36,12 +36,6 @@ without changes to the corresponding grd file. -->
                file="images/apps/topbar_button_maximize.png" type="BINDATA" />
       <include name="IDR_WEBUI_IMAGES_APPS_TOPBAR_BUTTON_MINIMIZE_PNG"
                file="images/apps/topbar_button_minimize.png" type="BINDATA" />
-      <include name="IDR_WEBUI_IMAGES_APPS_BUTTON_BUTTER_BAR_CLOSE_PNG"
-               file="images/apps/button_butter_bar_close.png" type="BINDATA" />
-      <include name="IDR_WEBUI_IMAGES_APPS_BUTTON_BUTTER_BAR_CLOSE_HOVER_PNG"
-               file="images/apps/button_butter_bar_close_hover.png" type="BINDATA" />
-      <include name="IDR_WEBUI_IMAGES_APPS_BUTTON_BUTTER_BAR_CLOSE_PRESSED_PNG"
-               file="images/apps/button_butter_bar_close_pressed.png" type="BINDATA" />
 
       <!-- Component apps common image resources - 2x -->
       <!-- Misc buttons -->
@@ -51,12 +45,6 @@ without changes to the corresponding grd file. -->
                file="images/2x/apps/topbar_button_maximize.png" type="BINDATA" />
       <include name="IDR_WEBUI_IMAGES_APPS_TOPBAR_BUTTON_2X_MINIMIZE_PNG"
                file="images/2x/apps/topbar_button_minimize.png" type="BINDATA" />
-      <include name="IDR_WEBUI_IMAGES_APPS_BUTTON_BUTTER_BAR_CLOSE_2X_PNG"
-               file="images/2x/apps/button_butter_bar_close.png" type="BINDATA" />
-      <include name="IDR_WEBUI_IMAGES_APPS_BUTTON_BUTTER_BAR_CLOSE_HOVER_2X_PNG"
-               file="images/2x/apps/button_butter_bar_close_hover.png" type="BINDATA" />
-      <include name="IDR_WEBUI_IMAGES_APPS_BUTTON_BUTTER_BAR_CLOSE_PRESSED_2X_PNG"
-               file="images/2x/apps/button_butter_bar_close_pressed.png" type="BINDATA" />
 
       <!-- Non-apps images -->
       <include name="IDR_WEBUI_IMAGES_ADD_SVG"