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

1 files changed, 5 insertions, 5 deletions

diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc
index fdc40c1..33625db 100644
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -461,11 +461,11 @@ Tab::Tab(TabController* controller)
   close_button_ = new TabCloseButton(this);
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   close_button_->SetImage(views::CustomButton::STATE_NORMAL,
-                          rb.GetImageSkiaNamed(IDR_CLOSE_1));
+                          rb.GetImageSkiaNamed(IDR_TAB_CLOSE));
   close_button_->SetImage(views::CustomButton::STATE_HOVERED,
-                          rb.GetImageSkiaNamed(IDR_CLOSE_1_H));
+                          rb.GetImageSkiaNamed(IDR_TAB_CLOSE_H));
   close_button_->SetImage(views::CustomButton::STATE_PRESSED,
-                          rb.GetImageSkiaNamed(IDR_CLOSE_1_P));
+                          rb.GetImageSkiaNamed(IDR_TAB_CLOSE_P));
   close_button_->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));
   // Disable animation so that the red danger sign shows up immediately
@@ -1090,8 +1090,8 @@ void Tab::PaintTab(gfx::Canvas* canvas) {
     close_button_color_ = title_color;
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     close_button_->SetBackground(close_button_color_,
-        rb.GetImageSkiaNamed(IDR_CLOSE_1),
-        rb.GetImageSkiaNamed(IDR_CLOSE_1_MASK));
+        rb.GetImageSkiaNamed(IDR_TAB_CLOSE),
+        rb.GetImageSkiaNamed(IDR_TAB_CLOSE_MASK));
   }
 }