Reapplies r91761.

chrome/browser/ui/gtk/download/download_item_gtk.cc

 // Copyright (c) 2011 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/download/download_item_gtk.h"
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
@@ skipping 99 matching lines @@
   body_.Own(gtk_button_new());
   gtk_widget_set_app_paintable(body_.get(), TRUE);
   UpdateTooltip();
 
   g_signal_connect(body_.get(), "expose-event",
                    G_CALLBACK(OnExposeThunk), this);
   g_signal_connect(body_.get(), "clicked",
                    G_CALLBACK(OnClickThunk), this);
   g_signal_connect(body_.get(), "button-press-event",
                    G_CALLBACK(OnButtonPressThunk), this);
-  GTK_WIDGET_UNSET_FLAGS(body_.get(), GTK_CAN_FOCUS);
+  gtk_widget_set_can_focus(body_.get(), FALSE);
   // Remove internal padding on the button.
   GtkRcStyle* no_padding_style = gtk_rc_style_new();
   no_padding_style->xthickness = 0;
   no_padding_style->ythickness = 0;
   gtk_widget_modify_style(body_.get(), no_padding_style);
   g_object_unref(no_padding_style);
 
   name_label_ = gtk_label_new(NULL);
   // Left align and vertically center the labels.
   gtk_misc_set_alignment(GTK_MISC(name_label_), 0, 0.5);
@@ skipping 21 matching lines @@
                    G_CALLBACK(OnProgressAreaExposeThunk), this);
 
   // Put the download progress icon on the left of the labels.
   GtkWidget* body_hbox = gtk_hbox_new(FALSE, 0);
   gtk_container_add(GTK_CONTAINER(body_.get()), body_hbox);
   gtk_box_pack_start(GTK_BOX(body_hbox), progress_area_.get(), FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(body_hbox), text_stack_, TRUE, TRUE, 0);
 
   menu_button_ = gtk_button_new();
   gtk_widget_set_app_paintable(menu_button_, TRUE);
-  GTK_WIDGET_UNSET_FLAGS(menu_button_, GTK_CAN_FOCUS);
+  gtk_widget_set_can_focus(menu_button_, FALSE);
   g_signal_connect(menu_button_, "expose-event",
                    G_CALLBACK(OnExposeThunk), this);
   g_signal_connect(menu_button_, "button-press-event",
                    G_CALLBACK(OnMenuButtonPressEventThunk), this);
   g_object_set_data(G_OBJECT(menu_button_), "left-align-popup",
                     reinterpret_cast<void*>(true));
 
   GtkWidget* shelf_hbox = parent_shelf->GetHBox();
   hbox_.Own(gtk_hbox_new(FALSE, 0));
   g_signal_connect(hbox_.get(), "expose-event",
@@ skipping 545 matching lines @@
 
       GtkAllocation right_allocation = menu_button_->allocation;
       GdkRectangle right_clip = {
         right_allocation.x, right_allocation.y,
         right_allocation.width, right_allocation.height
       };
 
       GtkShadowType body_shadow =
           GTK_BUTTON(body_.get())->depressed ? GTK_SHADOW_IN : GTK_SHADOW_OUT;
       gtk_paint_box(style, widget->window,
-                    static_cast<GtkStateType>(GTK_WIDGET_STATE(body_.get())),
+                    gtk_widget_get_state(body_.get()),
                     body_shadow,
                     &left_clip, widget, "button",
                     x, y, width, height);
 
       GtkShadowType menu_shadow =
           GTK_BUTTON(menu_button_)->depressed ? GTK_SHADOW_IN : GTK_SHADOW_OUT;
       gtk_paint_box(style, widget->window,
-                    static_cast<GtkStateType>(GTK_WIDGET_STATE(menu_button_)),
+                    gtk_widget_get_state(menu_button_),
                     menu_shadow,
                     &right_clip, widget, "button",
                     x, y, width, height);
 
       // Doing the math to reverse engineer where we should be drawing our line
       // is hard and relies on copying GTK internals, so instead steal the
       // allocation of the gtk arrow which is close enough (and will error on
       // the conservative side).
       GtkAllocation arrow_allocation = arrow_->allocation;
       gtk_paint_vline(style, widget->window,
-                      static_cast<GtkStateType>(GTK_WIDGET_STATE(widget)),
+                      gtk_widget_get_state(widget),
                       &e->area, widget, "button",
                       arrow_allocation.y,
                       arrow_allocation.y + arrow_allocation.height,
                       left_allocation.x + left_allocation.width);
     }
   }
   return FALSE;
 }
 
 gboolean DownloadItemGtk::OnExpose(GtkWidget* widget, GdkEventExpose* e) {
   if (!theme_service_->UsingNativeTheme()) {
     bool is_body = widget == body_.get();
 
     NineBox* nine_box = NULL;
     // If true, this widget is |body_|, otherwise it is |menu_button_|.
-    if (GTK_WIDGET_STATE(widget) == GTK_STATE_PRELIGHT)
+    if (gtk_widget_get_state(widget) == GTK_STATE_PRELIGHT)
       nine_box = is_body ? body_nine_box_prelight_ : menu_nine_box_prelight_;
-    else if (GTK_WIDGET_STATE(widget) == GTK_STATE_ACTIVE)
+    else if (gtk_widget_get_state(widget) == GTK_STATE_ACTIVE)
       nine_box = is_body ? body_nine_box_active_ : menu_nine_box_active_;
     else
       nine_box = is_body ? body_nine_box_normal_ : menu_nine_box_normal_;
 
     // When the button is showing, we want to draw it as active. We have to do
     // this explicitly because the button's state will be NORMAL while the menu
     // has focus.
     if (!is_body && menu_showing_)
       nine_box = menu_nine_box_active_;
 
@@ skipping 96 matching lines @@
   get_download()->DangerousDownloadValidated();
 }
 
 void DownloadItemGtk::OnDangerousDecline(GtkWidget* button) {
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download",
                            base::Time::Now() - creation_time_);
   if (get_download()->IsPartialDownload())
     get_download()->Cancel(true);
   get_download()->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD);
 }