Omnibox: Change |inline_autocomplete_offset| to |inline_autocompletion|

chrome/browser/ui/omnibox/omnibox_popup_model.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/omnibox/omnibox_popup_model.h"
 
 #include <algorithm>
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 93 matching lines @@
   view_->InvalidateLine(selected_line_);
 
   // Update the edit with the new data for this match.
   // TODO(pkasting): If |selected_line_| moves to the controller, this can be
   // eliminated and just become a call to the observer on the edit.
   string16 keyword;
   bool is_keyword_hint;
   match.GetKeywordUIState(edit_model_->profile(), &keyword, &is_keyword_hint);
 
   if (reset_to_default) {
-    string16 inline_autocomplete_text;
-    if ((match.inline_autocomplete_offset != string16::npos) &&
-        (match.inline_autocomplete_offset < match.fill_into_edit.length())) {
-      inline_autocomplete_text =
-          match.fill_into_edit.substr(match.inline_autocomplete_offset);
-    }
-    edit_model_->OnPopupDataChanged(inline_autocomplete_text, NULL,
+    edit_model_->OnPopupDataChanged(match.inline_autocompletion, NULL,
                                     keyword, is_keyword_hint);
   } else {
     edit_model_->OnPopupDataChanged(match.fill_into_edit, &current_destination,
                                     keyword, is_keyword_hint);
   }
 
   // Repaint old and new selected lines immediately, so that the edit doesn't
   // appear to update [much] faster than the popup.
   view_->PaintUpdatesNow();
 }
@@ skipping 97 matching lines @@
   }
 }
 
 void OmniboxPopupModel::AddObserver(OmniboxPopupModelObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void OmniboxPopupModel::RemoveObserver(OmniboxPopupModelObserver* observer) {
   observers_.RemoveObserver(observer);
 }