Instant Extended: Add prominent search term support

chrome/browser/ui/omnibox/omnibox_edit_model.cc

 // 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.
 
 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h"
 
 #include <string>
 
 #include "base/auto_reset.h"
 #include "base/format_macros.h"
@@ skipping 373 matching lines @@
   // 2. If it's in IME composition mode.
   // We send the caret position to Instant (so it can determine #1 itself), and
   // we use a separated widget for displaying the Instant suggest (so it doesn't
   // interfere with #2). So, we don't need to care about the value of
   // input.prevent_inline_autocomplete() here.
   return view_->DeleteAtEndPressed() || popup_->selected_line() != 0 ||
       just_deleted_text_;
 }
 
 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
   // !user_input_in_progress_, then permanent text is showing and should be a
   // URL, so no further checking is needed.  By avoiding checking in this case,
   // we avoid calling into the autocomplete providers, and thus initializing the
   // history system, as long as possible, which speeds startup.
   if (!user_input_in_progress_)
     return true;
 
@@ skipping 10 matching lines @@
 
 void OmniboxEditModel::AdjustTextForCopy(int sel_min,
                                          bool is_all_selected,
                                          string16* text,
                                          GURL* url,
                                          bool* write_url) {
   *write_url = false;
 
   // 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) {
     // The user selected all the text and has not edited it. Use the url as the
     // text so that if the scheme was stripped it's added back, and the url
     // is unescaped (we escape parts of the url for display).
     *url = PermanentURL();
     *text = UTF8ToUTF16(url->spec());
     *write_url = true;
     return;
@@ skipping 1019 matching lines @@
     instant->OmniboxFocusChanged(state, reason, NULL);
 
   // Update state and notify view if the omnibox has focus and the caret
   // visibility changed.
   const bool was_caret_visible = is_caret_visible();
   focus_state_ = state;
   if (focus_state_ != OMNIBOX_FOCUS_NONE &&
       is_caret_visible() != was_caret_visible)
     view_->ApplyCaretVisibility();
 }