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

chrome/browser/ui/views/omnibox/omnibox_view_win.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_win.h"
 
 #include <algorithm>
 #include <locale>
 #include <string>
 
@@ skipping 671 matching lines @@
 void OmniboxViewWin::SetUserText(const string16& text) {
   SetUserText(text, text, true);
 }
 
 void OmniboxViewWin::SetUserText(const string16& text,
                                  const string16& display_text,
                                  bool update_popup) {
   ScopedFreeze freeze(this, GetTextObjectModel());
   model_->SetUserText(text);
   saved_selection_for_focus_change_.cpMin = -1;
-  SetWindowTextAndCaretPos(display_text, display_text.length());
-  if (update_popup)
-    UpdatePopup();
-  TextChanged();
+  SetWindowTextAndCaretPos(display_text, display_text.length(), update_popup,
+      true);
 }
 
 void OmniboxViewWin::SetWindowTextAndCaretPos(const string16& text,
-                                              size_t caret_pos) {
+                                              size_t caret_pos,
+                                              bool update_popup,
+                                              bool notify_text_changed) {
   SetWindowText(text.c_str());
   PlaceCaretAt(caret_pos);
+
+  if (update_popup)
+    UpdatePopup();
+
+  if (notify_text_changed)
+    TextChanged();
 }
 
 void OmniboxViewWin::SetForcedQuery() {
   const string16 current_text(GetText());
   const size_t start = current_text.find_first_not_of(kWhitespaceWide);
   if (start == string16::npos || (current_text[start] != '?'))
     SetUserText(L"?");
   else
     SetSelection(current_text.length(), start + 1);
 }
@@ skipping 19 matching lines @@
 void OmniboxViewWin::SelectAll(bool reversed) {
   if (reversed)
     SetSelection(GetTextLength(), 0);
   else
     SetSelection(0, GetTextLength());
 }
 
 void OmniboxViewWin::RevertAll() {
   ScopedFreeze freeze(this, GetTextObjectModel());
   ClosePopup();
+  saved_selection_for_focus_change_.cpMin = -1;
   model_->Revert();
-  saved_selection_for_focus_change_.cpMin = -1;
-  TextChanged();
 }
 
 void OmniboxViewWin::UpdatePopup() {
   ScopedFreeze freeze(this, GetTextObjectModel());
   model_->SetInputInProgress(true);
 
   // Don't allow the popup to open while the candidate window is open, so
   // they don't overlap.
   if (ime_candidate_window_open_)
     return;
@@ skipping 74 matching lines @@
     GetSelection(original_selection_);
 
   // Set new text and cursor position.  Sometimes this does extra work (e.g.
   // when the new text and the old text are identical), but it's only called
   // when the user manually changes the selected line in the popup, so that's
   // not really a problem.  Also, even when the text hasn't changed we'd want to
   // update the caret, because if the user had the cursor in the middle of the
   // text and then arrowed to another entry with the same text, we'd still want
   // to move the caret.
   ScopedFreeze freeze(this, GetTextObjectModel());
-  SetWindowTextAndCaretPos(display_text, display_text.length());
-  TextChanged();
+  SetWindowTextAndCaretPos(display_text, display_text.length(), false, true);
 }
 
 bool OmniboxViewWin::OnInlineAutocompleteTextMaybeChanged(
     const string16& display_text,
     size_t user_text_length) {
   // Update the text and selection.  Because this can be called repeatedly while
   // typing, we've careful not to freeze the edit unless we really need to.
   // Also, unlike in the temporary text case above, here we don't want to update
   // the caret/selection unless we have to, since this might make the user's
   // caret position change without warning during typing.
@@ skipping 1230 matching lines @@
       }
 
       // We're showing a keyword and the user pressed backspace at the beginning
       // of the text. Delete the selected keyword.
       ScopedFreeze freeze(this, GetTextObjectModel());
       model_->ClearKeyword(GetText());
       return true;
     }
 
     case VK_TAB: {
-      if (model_->is_keyword_hint()) {
+      const bool shift_pressed = GetKeyState(VK_SHIFT) < 0;
+      if (model_->is_keyword_hint() && !shift_pressed) {
         // Accept the keyword.
         ScopedFreeze freeze(this, GetTextObjectModel());
         model_->AcceptKeyword();
-      } else if (!IsCaretAtEnd()) {
-        ScopedFreeze freeze(this, GetTextObjectModel());
-        OnBeforePossibleChange();
-        PlaceCaretAt(GetTextLength());
-        OnAfterPossibleChange();
+      } else if (shift_pressed &&
+                 model_->popup_model()->selected_line_state() ==
+                    AutocompletePopupModel::KEYWORD) {
+        model_->ClearKeyword(GetText());
       } else {
-        model_->CommitSuggestedText(true);
+        model_->OnUpOrDownKeyPressed(shift_pressed ? -count : count);
       }
       return true;
     }
 
     case 0xbb:  // Ctrl-'='.  Triggers subscripting (even in plain text mode).
                 // We don't use VK_OEM_PLUS in case the macro isn't defined.
                 // (e.g., we don't have this symbol in embeded environment).
       return true;
 
     default:
@@ skipping 601 matching lines @@
     return omnibox_view;
   }
   return new OmniboxViewWin(controller,
                             toolbar_model,
                             location_bar,
                             command_updater,
                             popup_window_mode,
                             location_bar);
 }
 #endif