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

chrome/browser/ui/gtk/infobars/infobar_gtk.cc

 // 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.
 
 #include "chrome/browser/ui/gtk/infobars/infobar_gtk.h"
 
 #include "base/debug/trace_event.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 65 matching lines @@
   // Add the icon on the left, if any.
   gfx::Image* icon = delegate->GetIcon();
   if (icon) {
     GtkWidget* image = gtk_image_new_from_pixbuf(icon->ToGdkPixbuf());
 
     gtk_misc_set_alignment(GTK_MISC(image), 0.5, 0.5);
 
     gtk_box_pack_start(GTK_BOX(hbox_), image, FALSE, FALSE, 0);
   }
 
-  close_button_.reset(CustomDrawButton::CloseButton(theme_service_));
+  close_button_.reset(CustomDrawButton::CloseButtonBar(theme_service_));
   gtk_util::CenterWidgetInHBox(hbox_, close_button_->widget(), true, 0);
   signals_->Connect(close_button_->widget(), "clicked",
                     G_CALLBACK(OnCloseButtonThunk), this);
 
   widget_.Own(gtk_expanded_container_new());
   gtk_container_add(GTK_CONTAINER(widget_.get()), bg_box_);
   gtk_widget_set_size_request(widget_.get(), -1, 0);
 
   g_signal_connect(widget_.get(), "child-size-request",
                    G_CALLBACK(OnChildSizeRequestThunk),
@@ skipping 209 matching lines @@
                          const content::NotificationSource& source,
                          const content::NotificationDetails& details) {
   UpdateBorderColor();
 }
 
 void InfoBarGtk::OnChildSizeRequest(GtkWidget* expanded,
                                     GtkWidget* child,
                                     GtkRequisition* requisition) {
   requisition->height = -1;
 }