Reapplies r91761.

chrome/browser/renderer_host/render_widget_host_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/renderer_host/render_widget_host_view_gtk.h"
 
 // If this gets included after the gtk headers, then a bunch of compiler
 // errors happen because of a "#define Status int" in Xlib.h, which interacts
 // badly with net::URLRequestStatus::Status.
 #include "chrome/common/render_messages.h"
@@ skipping 102 matching lines @@
 
     gtk_widget_add_events(widget, GDK_EXPOSURE_MASK |
                                   GDK_POINTER_MOTION_MASK |
                                   GDK_BUTTON_PRESS_MASK |
                                   GDK_BUTTON_RELEASE_MASK |
                                   GDK_KEY_PRESS_MASK |
                                   GDK_KEY_RELEASE_MASK |
                                   GDK_FOCUS_CHANGE_MASK |
                                   GDK_ENTER_NOTIFY_MASK |
                                   GDK_LEAVE_NOTIFY_MASK);
-    GTK_WIDGET_SET_FLAGS(widget, GTK_CAN_FOCUS);
+    gtk_widget_set_can_focus(widget, TRUE);
 
     g_signal_connect(widget, "expose-event",
                      G_CALLBACK(OnExposeEvent), host_view);
     g_signal_connect(widget, "key-press-event",
                      G_CALLBACK(OnKeyPressReleaseEvent), host_view);
     g_signal_connect(widget, "key-release-event",
                      G_CALLBACK(OnKeyPressReleaseEvent), host_view);
     g_signal_connect(widget, "focus-in-event",
                      G_CALLBACK(OnFocusIn), host_view);
     g_signal_connect(widget, "focus-out-event",
@@ skipping 181 matching lines @@
           !host_view->is_popup_first_mouse_release_ && !click_in_popup) {
         host_view->host_->Shutdown();
         return FALSE;
       }
       event->x = x;
       event->y = y;
     }
 
     // TODO(evanm): why is this necessary here but not in test shell?
     // This logic is the same as GtkButton.
-    if (event->type == GDK_BUTTON_PRESS && !GTK_WIDGET_HAS_FOCUS(widget))
+    if (event->type == GDK_BUTTON_PRESS && !gtk_widget_has_focus(widget))
       gtk_widget_grab_focus(widget);
 
     host_view->is_popup_first_mouse_release_ = false;
     host_view->GetRenderWidgetHost()->ForwardMouseEvent(
         WebInputEventFactory::mouseEvent(event));
 
     // Although we did handle the mouse event, we need to let other handlers
     // run (in particular the one installed by TabContentsViewGtk).
     return FALSE;
   }
@@ skipping 353 matching lines @@
 
 void RenderWidgetHostViewGtk::Show() {
   gtk_widget_show(view_.get());
 }
 
 void RenderWidgetHostViewGtk::Hide() {
   gtk_widget_hide(view_.get());
 }
 
 bool RenderWidgetHostViewGtk::IsShowing() {
-  // TODO(jcivelli): use gtk_widget_get_visible once we build with GTK 2.18.
-  return (GTK_WIDGET_FLAGS(view_.get()) & GTK_VISIBLE) != 0;
+  return gtk_widget_get_visible(view_.get());
 }
 
 gfx::Rect RenderWidgetHostViewGtk::GetViewBounds() const {
   GtkAllocation* alloc = &view_.get()->allocation;
   return gfx::Rect(alloc->x, alloc->y,
                    requested_size_.width(),
                    requested_size_.height());
 }
 
 void RenderWidgetHostViewGtk::UpdateCursor(const WebCursor& cursor) {
@@ skipping 473 matching lines @@
 }
 
 // static
 RenderWidgetHostView*
     RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView(
         gfx::NativeView widget) {
   gpointer user_data = g_object_get_data(G_OBJECT(widget),
                                          kRenderWidgetHostViewKey);
   return reinterpret_cast<RenderWidgetHostView*>(user_data);
 }