Reapplies r91761.

chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc

Index: chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
diff --git a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
index 14eef8233439cc7d2c0fad53a9773650e1d8a526..c03af198851b3ab61ce7ca83fd98b92eb25d3336 100644
--- a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
+++ b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
@@ -1259,7 +1259,7 @@ gboolean OmniboxViewGtk::HandleViewButtonPress(GtkWidget* sender,
     // determine whether we should select all of the text when the button is
     // released.
     button_1_pressed_ = true;
-    text_view_focused_before_button_press_ = GTK_WIDGET_HAS_FOCUS(text_view_);
+    text_view_focused_before_button_press_ = gtk_widget_has_focus(text_view_);
     text_selected_during_click_ = false;
 #endif
 
@@ -1700,7 +1700,7 @@ void OmniboxViewGtk::HandleViewMoveFocus(GtkWidget* widget,
     handled = true;
 #endif
 
-  if (!handled && GTK_WIDGET_VISIBLE(instant_view_))
+  if (!handled && gtk_widget_get_visible(instant_view_))
     handled = model_->CommitSuggestedText(true);
 
   if (!handled) {