linux_aura: Fixes a couple of issues with the button border integration.

chrome/browser/ui/libgtk2ui/gtk2_ui.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/libgtk2ui/gtk2_ui.h"
 
 #include <set>
 
 #include "base/command_line.h"
 #include "base/environment.h"
@@ skipping 510 matching lines @@
 
   SkBitmap bitmap = GdkPixbufToImageSkia(pixbuf.get());
   DCHECK_EQ(size, bitmap.width());
   DCHECK_EQ(size, bitmap.height());
   gfx::ImageSkia image_skia = gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
   image_skia.MakeThreadSafe();
   return gfx::Image(image_skia);
 }
 
 views::Border* Gtk2UI::CreateNativeBorder(
-    views::CustomButton* owning_button,
-    views::Border* border) {
+    views::LabelButton* owning_button,
+    views::LabelButtonBorder* border) {
   return new Gtk2Border(this, owning_button, border);
 }
 
 void Gtk2UI::AddWindowButtonOrderObserver(
     views::WindowButtonOrderObserver* observer) {
   if (!leading_buttons_.empty() || !trailing_buttons_.empty()) {
     observer->OnWindowButtonOrderingChange(leading_buttons_,
                                            trailing_buttons_);
   }
 
@@ skipping 632 matching lines @@
   retval.allocPixels();
   retval.eraseColor(0);
 
   const SkBitmap icon = GdkPixbufToImageSkia(gdk_icon);
   g_object_unref(gdk_icon);
 
   SkCanvas canvas(retval);
 
   if (gtk_state == GTK_STATE_ACTIVE || gtk_state == GTK_STATE_PRELIGHT) {
     SkBitmap border = DrawGtkButtonBorder(gtk_state,
+                                          false,
                                           default_bitmap.width(),
                                           default_bitmap.height());
     canvas.drawBitmap(border, 0, 0);
   }
 
   canvas.drawBitmap(icon,
                     (default_bitmap.width() / 2) - (icon.width() / 2),
                     (default_bitmap.height() / 2) - (icon.height() / 2));
 
   return retval;
 }
 
 SkBitmap Gtk2UI::GenerateToolbarBezel(int gtk_state, int sizing_idr) const {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   SkBitmap default_bitmap =
       rb.GetImageNamed(sizing_idr).AsBitmap();
 
   SkBitmap retval;
   retval.setConfig(SkBitmap::kARGB_8888_Config,
                    default_bitmap.width(),
                    default_bitmap.height());
   retval.allocPixels();
   retval.eraseColor(0);
 
   SkCanvas canvas(retval);
   SkBitmap border = DrawGtkButtonBorder(
       gtk_state,
+      false,
       default_bitmap.width(),
       default_bitmap.height());
   canvas.drawBitmap(border, 0, 0);
 
   return retval;
 }
 
 void Gtk2UI::GetNormalButtonTintHSL(color_utils::HSL* tint) const {
   GtkStyle* window_style = gtk_rc_get_style(fake_window_);
   const GdkColor accent_gdk_color = window_style->bg[GTK_STATE_SELECTED];
@@ skipping 19 matching lines @@
 void Gtk2UI::GetSelectedEntryForegroundHSL(color_utils::HSL* tint) const {
   // The simplest of all the tints. We just use the selected text in the entry
   // since the icons tinted this way will only be displayed against
   // base[GTK_STATE_SELECTED].
   GtkStyle* style = gtk_rc_get_style(fake_entry_.get());
   const GdkColor color = style->text[GTK_STATE_SELECTED];
   color_utils::SkColorToHSL(GdkColorToSkColor(color), tint);
 }
 
 SkBitmap Gtk2UI::DrawGtkButtonBorder(int gtk_state,
-                                     int width, int height) const {
+                                     bool focused,
+                                     int width,
+                                     int height) const {
   // Create a temporary GTK button to snapshot
   GtkWidget* window = gtk_offscreen_window_new();
   GtkWidget* button = gtk_button_new();
   gtk_widget_set_size_request(button, width, height);
   gtk_container_add(GTK_CONTAINER(window), button);
   gtk_widget_realize(window);
   gtk_widget_realize(button);
   gtk_widget_show(button);
   gtk_widget_show(window);
 
+  if (focused) {
+    // We can't just use gtk_widget_grab_focus() here because that sets
+    // gtk_widget_is_focus(), but not gtk_widget_has_focus(), which is what the
+    // GtkButton's paint checks.
+    GTK_WIDGET_SET_FLAGS(button, GTK_HAS_FOCUS);
+  }
+
   gtk_widget_set_state(button, static_cast<GtkStateType>(gtk_state));
 
   GdkPixmap* pixmap = gtk_widget_get_snapshot(button, NULL);
   int w, h;
   gdk_drawable_get_size(GDK_DRAWABLE(pixmap), &w, &h);
   DCHECK_EQ(w, width);
   DCHECK_EQ(h, height);
 
   // We render the Pixmap to a Pixbuf. This can be slow, as we're scrapping
   // bits from X.
@@ skipping 50 matching lines @@
 
 void Gtk2UI::ClearAllThemeData() {
   gtk_images_.clear();
 }
 
 }  // namespace libgtk2ui
 
 views::LinuxUI* BuildGtk2UI() {
   return new libgtk2ui::Gtk2UI;
 }