Revert 122412 - Enabled pressing TAB to traverse through the Omnibox results

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

 // Copyright (c) 2012 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 537 matching lines @@
 
 void OmniboxViewGtk::SetUserText(const string16& text) {
   SetUserText(text, text, true);
 }
 
 void OmniboxViewGtk::SetUserText(const string16& text,
                                  const string16& display_text,
                                  bool update_popup) {
   model_->SetUserText(text);
   // TODO(deanm): something about selection / focus change here.
-  SetWindowTextAndCaretPos(display_text, display_text.length(), update_popup,
-      true);
+  SetWindowTextAndCaretPos(display_text, display_text.length());
+  if (update_popup)
+    UpdatePopup();
+  TextChanged();
 }
 
 void OmniboxViewGtk::SetWindowTextAndCaretPos(const string16& text,
-                                              size_t caret_pos,
-                                              bool update_popup,
-                                              bool notify_text_changed) {
+                                              size_t caret_pos) {
   CharRange range(static_cast<int>(caret_pos), static_cast<int>(caret_pos));
   SetTextAndSelectedRange(text, range);
-
-  if (update_popup)
-    UpdatePopup();
-
-  if (notify_text_changed)
-    TextChanged();
 }
 
 void OmniboxViewGtk::SetForcedQuery() {
   const string16 current_text(GetText());
   const size_t start = current_text.find_first_not_of(kWhitespaceUTF16);
   if (start == string16::npos || (current_text[start] != '?')) {
     SetUserText(ASCIIToUTF16("?"));
   } else {
     StartUpdatingHighlightedText();
     SetSelectedRange(CharRange(current_text.size(), start + 1));
@@ skipping 54 matching lines @@
   model_->StopAutocomplete();
 }
 
 void OmniboxViewGtk::OnTemporaryTextMaybeChanged(
     const string16& display_text,
     bool save_original_selection) {
   if (save_original_selection)
     saved_temporary_selection_ = GetSelection();
 
   StartUpdatingHighlightedText();
-  SetWindowTextAndCaretPos(display_text, display_text.length(), false, false);
+  SetWindowTextAndCaretPos(display_text, display_text.length());
   FinishUpdatingHighlightedText();
   TextChanged();
 }
 
 bool OmniboxViewGtk::OnInlineAutocompleteTextMaybeChanged(
     const string16& display_text,
     size_t user_text_length) {
   if (display_text == GetText())
     return false;
 
@@ skipping 418 matching lines @@
   //
   // Then if the key event is one of Tab, Enter and Escape, we need to trigger
   // the corresponding special behavior if IME did not handle it.
   // For Escape key, if the default signal handler returns FALSE, then we know
   // it's not handled by IME.
   //
   // For Tab key, as "accepts-tab" property of |text_view_| is set to FALSE,
   // if IME did not handle it then "move-focus" signal will be emitted by the
   // default signal handler of |text_view_|. So we can intercept "move-focus"
   // signal of |text_view_| to know if a Tab key press event was handled by IME,
-  // and trigger Tab to search or result traversal behavior when necessary in
-  // the signal handler.
+  // and trigger Tab to search behavior when necessary in the signal handler.
   //
   // But for Enter key, if IME did not handle the key event, the default signal
   // handler will delete current selection range and insert '\n' and always
   // return TRUE. We need to prevent |text_view_| from performing this default
   // action if IME did not handle the key event, because we don't want the
   // content of omnibox to be changed before triggering our special behavior.
   // Otherwise our special behavior would not be performed correctly.
   //
   // But there is no way for us to prevent GtkTextView from handling the key
   // event and performing built-in operation. So in order to achieve our goal,
@@ skipping 21 matching lines @@
   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);
-
-  shift_was_pressed_ = event->state & GDK_SHIFT_MASK;
+                     !(event->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK));
 
   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.
@@ skipping 577 matching lines @@
 void OmniboxViewGtk::HandleViewMoveFocus(GtkWidget* widget,
                                          GtkDirectionType direction) {
   if (!tab_was_pressed_)
     return;
 
   // 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() && !shift_was_pressed_) {
+  if (model_->is_keyword_hint())
     handled = model_->AcceptKeyword();
-  } else if (model_->popup_model()->IsOpen()) {
-    if (shift_was_pressed_ &&
-        model_->popup_model()->selected_line_state() ==
-            AutocompletePopupModel::KEYWORD)
-      model_->ClearKeyword(GetText());
-    else
-      model_->OnUpOrDownKeyPressed(shift_was_pressed_ ? -1 : 1);
-
-    handled = true;
-  }
 
   if (supports_pre_edit_ && !handled && !pre_edit_.empty())
     handled = true;
 
   if (!handled && gtk_widget_get_visible(instant_view_))
     handled = model_->CommitSuggestedText(true);
 
+  if (!handled) {
+    if (!IsCaretAtEnd()) {
+      OnBeforePossibleChange();
+      PlaceCaretAt(GetTextLength());
+      OnAfterPossibleChange();
+      handled = true;
+    }
+  }
+
   if (!handled)
     handled = model_->AcceptCurrentInstantPreview();
 
   if (handled) {
     static guint signal_id = g_signal_lookup("move-focus", GTK_TYPE_WIDGET);
     g_signal_stop_emission(widget, signal_id, 0);
   }
 }
 
 void OmniboxViewGtk::HandleCopyClipboard(GtkWidget* sender) {
@@ skipping 646 matching lines @@
 
   // Make all the children of the widget visible. NOTE: this won't display
   // anything, it just toggles the visible flag.
   gtk_widget_show_all(omnibox_view->GetNativeView());
   // Hide the widget. NativeViewHostGtk will make it visible again as necessary.
   gtk_widget_hide(omnibox_view->GetNativeView());
 
   return omnibox_view;
 }
 #endif