Index: chrome/browser/renderer_host/render_widget_host_view_gtk.cc |
diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc |
index 50980935f137cfafc53cf3f9571499a99be49244..c6aeee099e41246644a7a63a1e2a93c42076e6be 100644 |
--- a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc |
+++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc |
@@ -119,7 +119,7 @@ class RenderWidgetHostViewGtkWidget { |
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); |
@@ -321,7 +321,7 @@ class RenderWidgetHostViewGtkWidget { |
// 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; |
@@ -695,8 +695,7 @@ void RenderWidgetHostViewGtk::Hide() { |
} |
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 { |