Use Instant suggested match type for Instant temporary text.

chrome/browser/ui/omnibox/omnibox_edit_model.h

 // Copyright 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_EDIT_MODEL_H_
 #define CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_EDIT_MODEL_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 489 matching lines @@
   // which is the URL of the current page.
   //
   // original_url_ is only valid when there is temporary text, and is used as
   // the unique identifier of the originally selected item.  Thus, if the user
   // arrows to a different item with the same text, we can still distinguish
   // them and not revert all the way to the permanent_text_.
   bool has_temporary_text_;
   GURL original_url_;
 
   // True if Instant set the current temporary text, as opposed to it being set
-  // due to the user arrowing up/down through the popup.
+  // due to the user arrowing up/down through the popup. This can only be true
+  // if |has_temporary_text_| is true.
   // TODO(sreeram): This is a temporary hack. Remove it once the omnibox edit
   // model/view code is decoupled from Instant (among other things).
   bool is_temporary_text_set_by_instant_;
 
+  // True if the current temporary text set by Instant is a search query; false
+  // if it is a URL that can be directly navigated to. This is only valid if
+  // |is_temporary_text_set_by_instant_| is true. This field is needed because
+  // Instant's temporary text doesn't come from the popup model, so we can't
+  // lookup its type from the current match.
+  bool is_instant_temporary_text_a_search_query_;

[Peter Kasting, 2013/04/08 20:13:50]

We now have several bools about what the text in the omnibox actually is. 
Consider changing at least some of these to an enum, e.g.

enum OmniboxTextType {
  PERMANENT_TEXT,
  USER_TEXT,
  NON_INSTANT_TEMPORARY_TEXT,
  INSTANT_TEMPORARY_URL,
  INSTANT_TEMPORARY_SEARCH
}

[sreeram, 2013/04/08 20:20:48]

Can I punt on this? @beaudoin's refactor should take care of this. Even if the
refactor calls for a large redesign, we can do parts of it (such as collapsing
related state variables into one) incrementally, quickly.

[Peter Kasting, 2013/04/08 20:34:06]

Sure.

+
   // When the user's last action was to paste, we disallow inline autocomplete
   // (on the theory that the user is trying to paste in a new URL or part of
   // one, and in either case inline autocomplete would get in the way).
   PasteState paste_state_;
 
   // Whether the control key is depressed.  We track this to avoid calling
   // UpdatePopup() repeatedly if the user holds down the key, and to know
   // whether to trigger "ctrl-enter" behavior.
   ControlKeyState control_key_state_;
 
@@ skipping 24 matching lines @@
   // an exact keyword match.  If this is true then keyword mode will be
   // triggered automatically if the input is "<keyword> <search string>".  We
   // allow this when CreatedKeywordSearchByInsertingSpaceInMiddle() is true.
   // This has no effect if we're already in keyword mode.
   bool allow_exact_keyword_match_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxEditModel);
 };
 
 #endif  // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_EDIT_MODEL_H_