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

chrome/browser/ui/views/location_bar/location_bar_view.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/location_bar/location_bar_view.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 999 matching lines @@
 #endif
 }
 
 std::string LocationBarView::GetClassName() const {
   return kViewClassName;
 }
 
 bool LocationBarView::SkipDefaultKeyEventProcessing(
     const views::KeyEvent& event) {
 #if defined(OS_WIN)
-  bool views_omnibox = views::Widget::IsPureViews();
   if (views::FocusManager::IsTabTraversalKeyEvent(event)) {
-    if (HasValidSuggestText()) {
-      // Return true so that the edit sees the tab and commits the suggestion.
+    if (location_entry_->model()->popup_model()->IsOpen()) {
+      // Return true so that the edit sees the tab and moves the selection.
       return true;
     }
     if (keyword_hint_view_->visible() && !event.IsShiftDown()) {
       // Return true so the edit gets the tab event and enters keyword mode.
       return true;
     }
 
-#if !defined(USE_AURA)
-    // If the caret is not at the end, then tab moves the caret to the end.
-    if (!views_omnibox && !GetOmniboxViewWin()->IsCaretAtEnd())
-      return true;
-#endif
-
     // Tab while showing instant commits instant immediately.
     // Return true so that focus traversal isn't attempted. The edit ends
     // up doing nothing in this case.
     if (location_entry_->model()->AcceptCurrentInstantPreview())
       return true;
   }
 
 #if !defined(USE_AURA)
-  if (!views_omnibox)
+  if (!views::Widget::IsPureViews())
     return GetOmniboxViewWin()->SkipDefaultKeyEventProcessing(event);
 #endif
   NOTIMPLEMENTED();
   return false;
 #else
   // This method is not used for Linux ports. See FocusManager::OnKeyEvent() in
   // src/ui/views/focus/focus_manager.cc for details.
   return false;
 #endif
 }
@@ skipping 187 matching lines @@
       !suggested_text_view_->GetText().empty();
 }
 
 #if !defined(USE_AURA)
 OmniboxViewWin* LocationBarView::GetOmniboxViewWin() {
   CHECK(!views::Widget::IsPureViews());
   return static_cast<OmniboxViewWin*>(location_entry_.get());
 }
 #endif
 #endif