Revert 190431 "Inconsistent use of [x] close panel icon"

> Inconsistent use of [x] close panel icon
> The close button in download pane should be the tab close button asset : tab_close_*.png
> (this was originally reported as part of BUG=173251).
> 
> By the same logic the same smaller bitmap with red hover background should be used for all infobars
> such as translate bar, save password bar, etc. It should also be used for find-in-page bar on all
> platforms (Mac was missed with the previous implementation).
> 
> The close button in the chrome UI and Web UI bubbles was left the same as before (this needs to be regression-tested).
> 
> Code was rearranged to make explicit the disrepancy between the IDR_CLOSE_BAR and IDR_CLOSE_BUBBLE.
> IDR_TAB_CLOSE was renamed IDR_CLOSE_1.
> IDR_CLOSE_BAR was renamed IDR_CLOSE_2.
> png files were also renamed.
> 
> BUG=217094
> TEST=Open any page that downloads an attachment such as gmail email with an attachment or a page with images. Download an image or an attachment. Verify that the close button in download bar at the bottom of the screen has a red circular background when mouse hovers over it - same as the close tab button.
> 
> TEST=Open find-in-page (Ctrl+F) box on Mac, Linux and Windows and check that the close button is same as tab close (has a red circular background when mouse hovers over it).
> 
> TEST=Open any infobar (translate / save password) on both ChromeOS and linux and check that the close button is same as tab close (has a red circular background when mouse hovers over it). Opening a non-English news page is usually the easiest way.
> 
> TEST=Trigger chrome to show a toolbar bubble such as extension installed bubble that shows when an extension is installed from chrome web store (see bitmaps in comments attached to BUG=217094). Confirm that the close buttons in those bubbles are NOT changed from before the change (they should NOT have the red circular background when mouse hovers over).
> 
> Review URL: https://codereview.chromium.org/12634025

TBR=flackr@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190432 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 4 insertions, 4 deletions

diff --git a/ui/resources/default_100_percent/close_2.png b/ui/resources/default_100_percent/close_bar.png
index 912df05d..912df05d 100644
--- a/ui/resources/default_100_percent/close_2.png
+++ b/ui/resources/default_100_percent/close_bar.png
diff --git a/ui/resources/default_100_percent/close_2_hover.png b/ui/resources/default_100_percent/close_bar_hover.png
index c5e1481..c5e1481 100644
--- a/ui/resources/default_100_percent/close_2_hover.png
+++ b/ui/resources/default_100_percent/close_bar_hover.png
diff --git a/ui/resources/default_100_percent/close_2_mask.png b/ui/resources/default_100_percent/close_bar_mask.png
index 0b604ee..0b604ee 100644
--- a/ui/resources/default_100_percent/close_2_mask.png
+++ b/ui/resources/default_100_percent/close_bar_mask.png
diff --git a/ui/resources/default_100_percent/close_2_pressed.png b/ui/resources/default_100_percent/close_bar_pressed.png
index cc5bbbe..cc5bbbe 100644
--- a/ui/resources/default_100_percent/close_2_pressed.png
+++ b/ui/resources/default_100_percent/close_bar_pressed.png
diff --git a/ui/resources/default_200_percent/close_2.png b/ui/resources/default_200_percent/close_bar.png
index 1818bb2..1818bb2 100644
--- a/ui/resources/default_200_percent/close_2.png
+++ b/ui/resources/default_200_percent/close_bar.png
diff --git a/ui/resources/default_200_percent/close_2_hover.png b/ui/resources/default_200_percent/close_bar_hover.png
index 04624df..04624df 100644
--- a/ui/resources/default_200_percent/close_2_hover.png
+++ b/ui/resources/default_200_percent/close_bar_hover.png
diff --git a/ui/resources/default_200_percent/close_2_mask.png b/ui/resources/default_200_percent/close_bar_mask.png
index fb57484..fb57484 100644
--- a/ui/resources/default_200_percent/close_2_mask.png
+++ b/ui/resources/default_200_percent/close_bar_mask.png
diff --git a/ui/resources/default_200_percent/close_2_pressed.png b/ui/resources/default_200_percent/close_bar_pressed.png
index 4d0b267..4d0b267 100644
--- a/ui/resources/default_200_percent/close_2_pressed.png
+++ b/ui/resources/default_200_percent/close_bar_pressed.png
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index 811bd91..748b9f9 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -163,10 +163,10 @@
       <if expr="pp_ifdef('toolkit_views')">
         <structure type="chrome_scaled_image" name="IDR_CLOSE" file="close.png" />
       </if>
-      <structure type="chrome_scaled_image" name="IDR_CLOSE_2" file="close_2.png" />
-      <structure type="chrome_scaled_image" name="IDR_CLOSE_2_H" file="close_2_hover.png" />
-      <structure type="chrome_scaled_image" name="IDR_CLOSE_2_MASK" file="close_2_mask.png" />
-      <structure type="chrome_scaled_image" name="IDR_CLOSE_2_P" file="close_2_pressed.png" />
+      <structure type="chrome_scaled_image" name="IDR_CLOSE_BAR" file="close_bar.png" />
+      <structure type="chrome_scaled_image" name="IDR_CLOSE_BAR_H" file="close_bar_hover.png" />
+      <structure type="chrome_scaled_image" name="IDR_CLOSE_BAR_MASK" file="close_bar_mask.png" />
+      <structure type="chrome_scaled_image" name="IDR_CLOSE_BAR_P" file="close_bar_pressed.png" />
       <structure type="chrome_scaled_image" name="IDR_CLOSE_DIALOG" file="close_dialog.png" />
       <structure type="chrome_scaled_image" name="IDR_CLOSE_DIALOG_H" file="close_dialog_hover.png" />
       <structure type="chrome_scaled_image" name="IDR_CLOSE_DIALOG_P" file="close_dialog_pressed.png" />