Revert 120018 - Revert 120005 - Enabled pressing TAB to traverse through the Omnibox results, rem...

chrome/browser/ui/views/omnibox/omnibox_view_views.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/views/omnibox/omnibox_view_views.h"
 
 #include "base/property_bag.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 246 matching lines @@
     if (model_->popup_model()->IsOpen())
       model_->popup_model()->TryDeletingCurrentItem();
   } else if (!handled && event.key_code() == ui::VKEY_UP) {
     model_->OnUpOrDownKeyPressed(-1);
     handled = true;
   } else if (!handled && event.key_code() == ui::VKEY_DOWN) {
     model_->OnUpOrDownKeyPressed(1);
     handled = true;
   } else if (!handled &&
              event.key_code() == ui::VKEY_TAB &&
-             !event.IsShiftDown() &&
              !event.IsControlDown()) {
-    if (model_->is_keyword_hint()) {
+    if (model_->is_keyword_hint() && !event.IsShiftDown()) {
       handled = model_->AcceptKeyword();
+    } else if (model_->popup_model()->IsOpen()) {
+      if (event.IsShiftDown() &&
+          model_->popup_model()->selected_line_state() ==
+              AutocompletePopupModel::KEYWORD) {
+        model_->ClearKeyword(GetText());
+      } else {
+        model_->OnUpOrDownKeyPressed(event.IsShiftDown() ? -1 : 1);
+      }
+      handled = true;
     } else {
       string16::size_type start = 0;
       string16::size_type end = 0;
       size_t length = GetTextLength();
       GetSelectionBounds(&start, &end);
       if (start != end || start < length) {
         OnBeforePossibleChange();
         textfield_->SelectRange(ui::Range(length, length));
         OnAfterPossibleChange();
         handled = true;
@@ skipping 173 matching lines @@
 }
 
 void OmniboxViewViews::SetUserText(const string16& text) {
   SetUserText(text, text, true);
 }
 
 void OmniboxViewViews::SetUserText(const string16& text,
                                    const string16& display_text,
                                    bool update_popup) {
   model_->SetUserText(text);
-  SetWindowTextAndCaretPos(display_text, display_text.length());
-  if (update_popup)
-    UpdatePopup();
-  TextChanged();
+  SetWindowTextAndCaretPos(display_text, display_text.length(), update_popup,
+      true);
 }
 
 void OmniboxViewViews::SetWindowTextAndCaretPos(const string16& text,
-                                                size_t caret_pos) {
+                                                size_t caret_pos,
+                                                bool update_popup,
+                                                bool notify_text_changed) {
   const ui::Range range(caret_pos, caret_pos);
   SetTextAndSelectedRange(text, range);
 }
 
 void OmniboxViewViews::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
@@ skipping 55 matching lines @@
   // In views-implementation, the focus is on textfield rather than OmniboxView.
   textfield_->RequestFocus();
 }
 
 void OmniboxViewViews::OnTemporaryTextMaybeChanged(
     const string16& display_text,
     bool save_original_selection) {
   if (save_original_selection)
     textfield_->GetSelectedRange(&saved_temporary_selection_);
 
-  SetWindowTextAndCaretPos(display_text, display_text.length());
-  TextChanged();
+  SetWindowTextAndCaretPos(display_text, display_text.length(), false, true);
 }
 
 bool OmniboxViewViews::OnInlineAutocompleteTextMaybeChanged(
     const string16& display_text,
     size_t user_text_length) {
   if (display_text == GetText())
     return false;
   ui::Range range(display_text.size(), user_text_length);
   SetTextAndSelectedRange(display_text, range);
   TextChanged();
@@ skipping 294 matching lines @@
   OmniboxViewViews* omnibox_view = new OmniboxViewViews(controller,
                                                         toolbar_model,
                                                         profile,
                                                         command_updater,
                                                         popup_window_mode,
                                                         location_bar);
   omnibox_view->Init();
   return omnibox_view;
 }
 #endif