Revert 91761 - GTK: More 2.18 goodness. Move from macros to real accessor functions.

chrome/browser/ui/gtk/notifications/balloon_view_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/notifications/balloon_view_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <string>
 #include <vector>
@@ skipping 269 matching lines @@
   close_button_.reset(new CustomDrawButton(IDR_TAB_CLOSE,
                                            IDR_TAB_CLOSE_P,
                                            IDR_TAB_CLOSE_H,
                                            IDR_TAB_CLOSE));
   close_button_->SetBackground(SK_ColorBLACK,
                                rb.GetBitmapNamed(IDR_TAB_CLOSE),
                                rb.GetBitmapNamed(IDR_TAB_CLOSE_MASK));
   gtk_widget_set_tooltip_text(close_button_->widget(), dismiss_text.c_str());
   g_signal_connect(close_button_->widget(), "clicked",
                    G_CALLBACK(OnCloseButtonThunk), this);
-  gtk_widget_set_can_focus(close_button_->widget(), FALSE);
+  GTK_WIDGET_UNSET_FLAGS(close_button_->widget(), GTK_CAN_FOCUS);
   GtkWidget* close_alignment = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
   gtk_alignment_set_padding(GTK_ALIGNMENT(close_alignment),
                             kShelfVerticalMargin, kShelfVerticalMargin,
                             0, kButtonSpacing);
   gtk_container_add(GTK_CONTAINER(close_alignment), close_button_->widget());
   gtk_box_pack_end(GTK_BOX(hbox_), close_alignment, FALSE, FALSE, 0);
 
   // Create a button for showing the options menu, and add it to the toolbar.
   options_menu_button_.reset(new CustomDrawButton(IDR_BALLOON_WRENCH,
                                                   IDR_BALLOON_WRENCH_P,
                                                   IDR_BALLOON_WRENCH_H,
                                                   0));
   gtk_widget_set_tooltip_text(options_menu_button_->widget(),
                               options_text.c_str());
   g_signal_connect(options_menu_button_->widget(), "button-press-event",
                    G_CALLBACK(OnOptionsMenuButtonThunk), this);
-  gtk_widget_set_can_focus(options_menu_button_->widget(), FALSE);
+  GTK_WIDGET_UNSET_FLAGS(options_menu_button_->widget(), GTK_CAN_FOCUS);
   GtkWidget* options_alignment = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
   gtk_alignment_set_padding(GTK_ALIGNMENT(options_alignment),
                             kShelfVerticalMargin, kShelfVerticalMargin,
                             0, kButtonSpacing);
   gtk_container_add(GTK_CONTAINER(options_alignment),
                     options_menu_button_->widget());
   gtk_box_pack_end(GTK_BOX(hbox_), options_alignment, FALSE, FALSE, 0);
 
   notification_registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
                               Source<ThemeService>(theme_service_));
@@ skipping 153 matching lines @@
         method_factory_.NewRunnableMethod(
             &BalloonViewImpl::DelayedClose, false));
   }
 }
 
 gboolean BalloonViewImpl::OnDestroy(GtkWidget* widget) {
   frame_container_ = NULL;
   Close(false);
   return FALSE;  // Propagate.
 }