Revert 67949 - [gtk] tab in omnibox...

chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc

 // Copyright (c) 2010 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/autocomplete/autocomplete_edit_view_gtk.h"
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
 #include <algorithm>
@@ skipping 874 matching lines @@
   // Now the last thing is to prevent the content of omnibox from being changed
   // by GtkTextView when Enter key is pressed. As OnBeforePossibleChange() and
   // OnAfterPossibleChange() will be called by GtkTextView before and after
   // changing the content, and the content is already saved in
   // OnBeforePossibleChange(), so if the Enter key press event was not handled
   // by IME, it's easy to restore the content in OnAfterPossibleChange(), as if
   // it's not changed at all.
 
   GtkWidgetClass* klass = GTK_WIDGET_GET_CLASS(widget);
 
-  enter_was_pressed_ = event->keyval == GDK_Return ||
-                       event->keyval == GDK_ISO_Enter ||
-                       event->keyval == GDK_KP_Enter;
+  enter_was_pressed_ = (event->keyval == GDK_Return ||
+                        event->keyval == GDK_ISO_Enter ||
+                        event->keyval == GDK_KP_Enter);
 
   // Set |tab_was_pressed_| to true if it's a Tab key press event, so that our
   // handler of "move-focus" signal can trigger Tab to search behavior when
   // necessary.
-  tab_was_pressed_ = (event->keyval == GDK_Tab ||
-                      event->keyval == GDK_ISO_Left_Tab ||
-                      event->keyval == GDK_KP_Tab) &&
-                     !(event->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK));
+  tab_was_pressed_ = ((event->keyval == GDK_Tab ||
+                       event->keyval == GDK_ISO_Left_Tab ||
+                       event->keyval == GDK_KP_Tab) &&
+                      !(event->state & GDK_CONTROL_MASK));
 
-  delete_was_pressed_ = event->keyval == GDK_Delete ||
-                        event->keyval == GDK_KP_Delete;
+  delete_was_pressed_ = (event->keyval == GDK_Delete ||
+                         event->keyval == GDK_KP_Delete);
 
   // Reset |enter_was_inserted_|, which may be set in the "insert-text" signal
   // handler, so that we'll know if an Enter key event was handled by IME.
   enter_was_inserted_ = false;
 
   // Reset |paste_clipboard_requested_| to make sure we won't misinterpret this
   // key input action as a paste action.
   paste_clipboard_requested_ = false;
 
   // Reset |text_changed_| before passing the key event on to the text view.
@@ skipping 459 matching lines @@
   // of the text. Delete the selected keyword.
   model_->ClearKeyword(GetText());
 
   // Stop propagating the signal emission into GtkTextView.
   static guint signal_id = g_signal_lookup("backspace", GTK_TYPE_TEXT_VIEW);
   g_signal_stop_emission(text_view_, signal_id, 0);
 }
 
 void AutocompleteEditViewGtk::HandleViewMoveFocus(GtkWidget* widget,
                                                   GtkDirectionType direction) {
-  if (!tab_was_pressed_)
-    return;
+  // Trigger Tab to search behavior only when Tab key is pressed.
+  if (tab_was_pressed_ && enable_tab_to_search_ &&
+      model_->is_keyword_hint() && !model_->keyword().empty()) {
+    model_->AcceptKeyword();
 
-  // If special behavior is triggered, then stop the signal emission to
-  // prevent the focus from being moved.
-  bool handled = false;
-
-  // Trigger Tab to search behavior only when Tab key is pressed.
-  if (model_->is_keyword_hint() && !model_->keyword().empty()) {
-    if (enable_tab_to_search_) {
-      model_->AcceptKeyword();
-      handled = true;
-    }
-  } else {
-    if (GTK_WIDGET_VISIBLE(instant_view_)) {
-      controller_->OnCommitSuggestedText(GetText());
-      handled = true;
-    } else {
-      handled = controller_->AcceptCurrentInstantPreview();
-    }
-  }
-
-  if (handled) {
+    // If Tab to search behavior is triggered, then stop the signal emission to
+    // prevent the focus from being moved.
     static guint signal_id = g_signal_lookup("move-focus", GTK_TYPE_WIDGET);
     g_signal_stop_emission(widget, signal_id, 0);
   }
+
+  // Propagate the signal so that focus can be moved as normal.
 }
 
 void AutocompleteEditViewGtk::HandleCopyClipboard(GtkWidget* sender) {
   HandleCopyOrCutClipboard(true);
 }
 
 void AutocompleteEditViewGtk::HandleCutClipboard(GtkWidget* sender) {
   HandleCopyOrCutClipboard(false);
 }
 
@@ skipping 548 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);
 }