Inconsistent use of [x] close panel icon. Code changes.

chrome/browser/ui/cocoa/infobars/infobar_controller.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h"
 
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #import "chrome/browser/ui/cocoa/animatable_view.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/hyperlink_text_view.h"
 #import "chrome/browser/ui/cocoa/image_button_cell.h"
 #include "chrome/browser/ui/cocoa/infobars/infobar.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_gradient_view.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
+#include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/gfx/image/image.h"
 
 namespace {
 // Durations set to match the default SlideAnimation duration.
 const float kAnimateOpenDuration = 0.12;
 const float kAnimateCloseDuration = 0.12;
 }
 
 @interface InfoBarController (PrivateMethods)
@@ skipping 24 matching lines @@
     owner_ = owner;
   }
   return self;
 }
 
 // All infobars have an icon, so we set up the icon in the base class
 // awakeFromNib.
 - (void)awakeFromNib {
   DCHECK(delegate_);
 
-  [[closeButton_ cell] setImageID:IDR_CLOSE_BAR
+  [[closeButton_ cell] setImageID:IDR_CLOSE_1
                    forButtonState:image_button_cell::kDefaultState];
-  [[closeButton_ cell] setImageID:IDR_CLOSE_BAR_H
+  [[closeButton_ cell] setImageID:IDR_CLOSE_1_H
                    forButtonState:image_button_cell::kHoverState];
-  [[closeButton_ cell] setImageID:IDR_CLOSE_BAR_P
+  [[closeButton_ cell] setImageID:IDR_CLOSE_1_P
                    forButtonState:image_button_cell::kPressedState];
-  [[closeButton_ cell] setImageID:IDR_CLOSE_BAR
+  [[closeButton_ cell] setImageID:IDR_CLOSE_1
                    forButtonState:image_button_cell::kDisabledState];
 
   if (delegate_->GetIcon()) {
     [image_ setImage:delegate_->GetIcon()->ToNSImage()];
   } else {
     // No icon, remove it from the view and grow the textfield to include the
     // space.
     NSRect imageFrame = [image_ frame];
     NSRect labelFrame = [labelPlaceholder_ frame];
     labelFrame.size.width += NSMinX(imageFrame) - NSMinX(labelFrame);
@@ skipping 188 matching lines @@
   if (!windowController) {
     // This should only happen in unit tests.
     return NSZeroPoint;
   }
 
   LocationBarViewMac* locationBar = [windowController locationBarBridge];
   return locationBar->GetPageInfoBubblePoint();
 }
 
 @end