Refactor OmniboxEditModel::user_text_ to not include keyword

chrome/browser/ui/views/omnibox/omnibox_view_views.cc

 // 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.
 
 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
 
 #include <set>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 253 matching lines @@
     EmphasizeURLComponents();
   }
 }
 
 base::string16 OmniboxViewViews::GetText() const {
   // TODO(oshima): IME support
   return text();
 }
 
 void OmniboxViewViews::SetUserText(const base::string16& text,
-                                   const base::string16& display_text,
                                    bool update_popup) {
   saved_selection_for_focus_change_ = gfx::Range::InvalidRange();
-  OmniboxView::SetUserText(text, display_text, update_popup);
+  OmniboxView::SetUserText(text, update_popup);
 }
 
 void OmniboxViewViews::SetForcedQuery() {
   const base::string16 current_text(text());
   const size_t start = current_text.find_first_not_of(base::kWhitespaceUTF16);
   if (start == base::string16::npos || (current_text[start] != '?'))
     OmniboxView::SetUserText(base::ASCIIToUTF16("?"));
   else
     SelectRange(gfx::Range(current_text.size(), start + 1));
 }
@@ skipping 140 matching lines @@
       (model()->popup_model()->selected_line_state() ==
           OmniboxPopupModel::KEYWORD))
     model()->ClearKeyword();
   else
     model()->OnUpOrDownKeyPressed(event.IsShiftDown() ? -1 : 1);
 
   return true;
 }
 
 void OmniboxViewViews::AccessibilitySetValue(const base::string16& new_value) {
-  SetUserText(new_value, new_value, true);
+  SetUserText(new_value, true);
 }
 
 void OmniboxViewViews::UpdateSecurityLevel() {
   security_level_ = controller()->GetToolbarModel()->GetSecurityLevel(false);
 }
 
 void OmniboxViewViews::SetWindowTextAndCaretPos(const base::string16& text,
                                                 size_t caret_pos,
                                                 bool update_popup,
                                                 bool notify_text_changed) {
@@ skipping 626 matching lines @@
     menu_contents->InsertItemWithStringIdAt(
         select_all_position + 1, IDS_SHOW_URL, IDS_SHOW_URL);
   }
 
   // Minor note: We use IDC_ for command id here while the underlying textfield
   // is using IDS_ for all its command ids. This is because views cannot depend
   // on IDC_ for now.
   menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES,
       IDS_EDIT_SEARCH_ENGINES);
 }