Cleanup: Remove "gray text" logic from Omnibox

components/omnibox/browser/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 "components/omnibox/browser/omnibox_edit_model.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 72 matching lines @@
 const char kFocusToOpenTimeHistogram[] =
     "Omnibox.FocusToOpenTimeAnyPopupState2";
 
 }  // namespace
 
 
 // OmniboxEditModel::State ----------------------------------------------------
 
 OmniboxEditModel::State::State(bool user_input_in_progress,
                                const base::string16& user_text,
-                               const base::string16& gray_text,
                                const base::string16& keyword,
                                bool is_keyword_hint,
                                KeywordModeEntryMethod keyword_mode_entry_method,
                                OmniboxFocusState focus_state,
                                FocusSource focus_source,
                                const AutocompleteInput& autocomplete_input)
     : user_input_in_progress(user_input_in_progress),
       user_text(user_text),
-      gray_text(gray_text),
       keyword(keyword),
       is_keyword_hint(is_keyword_hint),
       keyword_mode_entry_method(keyword_mode_entry_method),
       focus_state(focus_state),
       focus_source(focus_source),
       autocomplete_input(autocomplete_input) {
 }
 
 OmniboxEditModel::State::State(const State& other) = default;
 
@@ skipping 39 matching lines @@
       base::AutoReset<bool> tmp(&in_revert_, true);
       view_->RevertAll();
       view_->SelectAll(true);
     } else {
       InternalSetUserText(display_text);
     }
   }
 
   UMA_HISTOGRAM_BOOLEAN("Omnibox.SaveStateForTabSwitch.UserInputInProgress",
                         user_input_in_progress_);
-  return State(
-      user_input_in_progress_, user_text_, view_->GetGrayTextAutocompletion(),
-      keyword_, is_keyword_hint_, keyword_mode_entry_method_,
-      focus_state_, focus_source_, input_);
+  return State(user_input_in_progress_, user_text_, keyword_, is_keyword_hint_,
+               keyword_mode_entry_method_, focus_state_, focus_source_, input_);
 }
 
 void OmniboxEditModel::RestoreState(const State* state) {
   // We need to update the permanent text correctly and revert the view
   // regardless of whether there is saved state.
   permanent_text_ = controller_->GetToolbarModel()->GetFormattedURL(nullptr);
   view_->RevertAll();
   // Restore the autocomplete controller's input, or clear it if this is a new
   // tab.
   input_ = state ? state->autocomplete_input : AutocompleteInput();
   if (!state)
     return;
 
   SetFocusState(state->focus_state, OMNIBOX_FOCUS_CHANGE_TAB_SWITCH);
   focus_source_ = state->focus_source;
   // Restore any user editing.
   if (state->user_input_in_progress) {
     // NOTE: Be sure to set keyword-related state AFTER invoking
     // SetUserText(), as SetUserText() clears the keyword state.
     view_->SetUserText(state->user_text, false);
     keyword_ = state->keyword;
     is_keyword_hint_ = state->is_keyword_hint;
     keyword_mode_entry_method_ = state->keyword_mode_entry_method;
-    view_->SetGrayTextAutocompletion(state->gray_text);
   }
 }
 
 AutocompleteMatch OmniboxEditModel::CurrentMatch(
     GURL* alternate_nav_url) const {
   // If we have a valid match use it. Otherwise get one for the current text.
   AutocompleteMatch match = omnibox_controller_->current_match();
 
   if (!match.destination_url.is_valid()) {
     GetInfoForCurrentText(&match, alternate_nav_url);
@@ skipping 10 matching lines @@
   // define "interacting" as "the omnibox has focus", but we still allow updates
   // when the omnibox has focus as long as the user hasn't begun editing, isn't
   // seeing zerosuggestions (because changing this text would require changing
   // or hiding those suggestions), and hasn't toggled on "Show URL" (because
   // this update will re-enable search term replacement, which will be annoying
   // if the user is trying to copy the URL).  When the omnibox doesn't have
   // focus, we assume the user may have abandoned their interaction and it's
   // always safe to change the text; this also prevents someone toggling "Show
   // URL" (which sounds as if it might be persistent) from seeing just that URL
   // forever afterwards.
-  //
-  // If the page is auto-committing gray text, however, we generally don't want
-  // to make any change to the edit.  While auto-commits modify the underlying
-  // permanent URL, they're intended to have no effect on the user's editing
-  // process -- before and after the auto-commit, the omnibox should show the
-  // same user text and the same instant suggestion, even if the auto-commit
-  // happens while the edit doesn't have focus.
   base::string16 new_permanent_text =
       controller_->GetToolbarModel()->GetFormattedURL(nullptr);
-  base::string16 gray_text = view_->GetGrayTextAutocompletion();
   const bool visibly_changed_permanent_text =
       (permanent_text_ != new_permanent_text) &&
-      (!has_focus() || (!user_input_in_progress_ && !PopupIsOpen())) &&
-      (gray_text.empty() || new_permanent_text != user_text_ + gray_text);
+      (!has_focus() || (!user_input_in_progress_ && !PopupIsOpen()));
 
   permanent_text_ = new_permanent_text;
   return visibly_changed_permanent_text;
 }
 
 GURL OmniboxEditModel::PermanentURL() const {
   return url_formatter::FixupURL(base::UTF16ToUTF8(permanent_text_),
                                  std::string());
 }
 
 void OmniboxEditModel::SetUserText(const base::string16& text) {
   SetInputInProgress(true);
   keyword_.clear();
   is_keyword_hint_ = false;
   InternalSetUserText(text);
   omnibox_controller_->InvalidateCurrentMatch();
   paste_state_ = NONE;
   has_temporary_text_ = false;
 }
 
-bool OmniboxEditModel::CommitSuggestedText() {
-  const base::string16 suggestion = view_->GetGrayTextAutocompletion();
-  if (suggestion.empty())
-    return false;
-
-  const base::string16 final_text = view_->GetText() + suggestion;
-  view_->OnBeforePossibleChange();
-  view_->SetWindowTextAndCaretPos(final_text, final_text.length(), false,
-      false);
-  view_->OnAfterPossibleChange(true);
-  return true;
-}
-
 void OmniboxEditModel::OnChanged() {
-  // Hide any suggestions we might be showing.
-  view_->SetGrayTextAutocompletion(base::string16());
-
   // Don't call CurrentMatch() when there's no editing, as in this case we'll
   // never actually use it.  This avoids running the autocomplete providers (and
   // any systems they then spin up) during startup.
   const AutocompleteMatch& current_match = user_input_in_progress_ ?
       CurrentMatch(nullptr) : AutocompleteMatch();
 
   client_->OnTextChanged(current_match, user_input_in_progress_, user_text_,
                          result(), PopupIsOpen(), has_focus());
   controller_->OnChanged();
 }
@@ skipping 1135 matching lines @@
   // 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();
 
   client_->OnFocusChanged(focus_state_, reason);
 }