Instant Extended: Add prominent search term support

chrome/browser/ui/omnibox/omnibox_edit_model.cc

Index: chrome/browser/ui/omnibox/omnibox_edit_model.cc
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc
index 597cca8b125c8d7e8251d6c8dbbae894189afd7e..2e536a31102902db15752eee6359ba771b801239 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc
+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc
@@ -391,7 +391,8 @@ bool OmniboxEditModel::UseVerbatimInstant() {
 }
 
 bool OmniboxEditModel::CurrentTextIsURL() const {
-  if (view_->toolbar_model()->WouldReplaceSearchURLWithSearchTerms())
+  if (view_->toolbar_model()->GetSearchTermType() !=
+      ToolbarModel::SEARCH_TERM_NONE)
     return false;
 
   // If current text is not composed of replaced search terms and
@@ -422,8 +423,8 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min,
 
   // Do not adjust if selection did not start at the beginning of the field, or
   // if the URL was replaced by search terms.
-  if (sel_min != 0 ||
-      view_->toolbar_model()->WouldReplaceSearchURLWithSearchTerms())
+  if (sel_min != 0 || view_->toolbar_model()->GetSearchTermType() !=

[Peter Kasting, 2013/04/25 19:42:54]

Nit: Odd indenting; how about:

  if ((sel_min != 0) ||
      (view_->toolbar_model()->GetSearchTermType() !=
          ToolbarModel::SEARCH_TERM_NONE))

[sail, 2013/04/25 22:18:46]

Done.

+                      ToolbarModel::SEARCH_TERM_NONE)
     return;
 
   if (!user_input_in_progress_ && is_all_selected) {