Reapplies r91761.

chrome/browser/ui/gtk/omnibox/omnibox_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/omnibox/omnibox_view_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include <algorithm>
@@ skipping 1241 matching lines @@
     return FALSE;
 
   DCHECK(text_view_);
 
   if (event->button == 1) {
 #if defined(OS_CHROMEOS)
     // When the first button is pressed, track some stuff that will help us
     // 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
 
     // Button press event may change the selection, we need to record the change
     // and report it to |model_| later when button is released.
     OnBeforePossibleChange();
   } else if (event->button == 2) {
     // GtkTextView pastes PRIMARY selection with middle click.
     // We can't call model_->on_paste_replacing_all() here, because the actual
     // paste clipboard action may not be performed if the clipboard is empty.
@@ skipping 420 matching lines @@
 
   // Trigger Tab to search behavior only when Tab key is pressed.
   if (model_->is_keyword_hint())
     handled = model_->AcceptKeyword();
 
 #if GTK_CHECK_VERSION(2, 20, 0)
   if (!handled && !pre_edit_.empty())
     handled = true;
 #endif
 
-  if (!handled && GTK_WIDGET_VISIBLE(instant_view_))
+  if (!handled && gtk_widget_get_visible(instant_view_))
     handled = model_->CommitSuggestedText(true);
 
   if (!handled) {
     if (!IsCaretAtEnd()) {
       OnBeforePossibleChange();
       PlaceCaretAt(GetTextLength());
       OnAfterPossibleChange();
       handled = true;
     }
   }
@@ skipping 620 matching lines @@
   // baseline, so we need to move the |instant_view_| down to make sure it
   // has the same baseline as the |text_view_|.
   PangoLayout* layout = gtk_label_get_layout(GTK_LABEL(instant_view_));
   int height;
   pango_layout_get_size(layout, NULL, &height);
   PangoLayoutIter* iter = pango_layout_get_iter(layout);
   int baseline = pango_layout_iter_get_baseline(iter);
   pango_layout_iter_free(iter);
   g_object_set(instant_anchor_tag_, "rise", baseline - height, NULL);
 }