Make GetInfoForCurrentText() return the correct match when we've selected an

chrome/browser/ui/omnibox/omnibox_popup_model.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_POPUP_MODEL_H_
 #define CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_POPUP_MODEL_H_
 
 #include "base/basictypes.h"
 #include "base/observer_list.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
@@ skipping 68 matching lines @@
   // will change the selected line back to the default match and redraw.
   void ResetToDefaultMatch();
 
   // Immediately updates and opens the popup if necessary, then moves the
   // current selection down (|count| > 0) or up (|count| < 0), clamping to the
   // first or last result if necessary.  If |count| == 0, the selection will be
   // unchanged, but the popup will still redraw and modify the text in the
   // OmniboxEditModel.
   void Move(int count);
 
   // If the selected line has both a normal match and a keyword match, this can

[Mark P, 2015/04/21 21:54:08]

FYI: I would love if this is said associated_keyword instead of keyword.  That
makes it clear the keyword match is actually part of the normal match
suggestion.

[Peter Kasting, 2015/04/21 21:58:00]

I think that's a slight layering violation, comment-wise -- it exposes the
implementation detail of how AutocompleteMatch tracks these two matches.  From
the perspective of the caller here, they don't care whether the matches are
independent or one is stored on the other.

-  // be used to choose which to select. It is an error to call this when the
-  // selected line does not have both matches (or there is no selection).
+  // be used to choose which to select.  This allows the user to toggle between
+  // normal and keyword mode with tab/shift-tab without rerunning autocomplete
+  // or disturbing other popup state, which in turn is an important part of
+  // supporting the use of tab to do both tab-to-search and
+  // tab-to-traverse-dropdown.
+  //
+  // It is an error to call this when the selected line does not have both
+  // matches (or there is no selection).
   void SetSelectedLineState(LineState state);
 
   // Called when the user hits shift-delete.  This should determine if the item
   // can be removed from history, and if so, remove it and update the popup.
   void TryDeletingCurrentItem();
 
   // If |match| is from an extension, returns the extension icon; otherwise
   // returns an empty Image.
   gfx::Image GetIconIfExtensionMatch(const AutocompleteMatch& match) const;
 
@@ skipping 38 matching lines @@
   // The match the user has manually chosen, if any.
   AutocompleteResult::Selection manually_selected_match_;
 
   // Observers.
   ObserverList<OmniboxPopupModelObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxPopupModel);
 };
 
 #endif  // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_POPUP_MODEL_H_