Omnibox: Change |inline_autocomplete_offset| to |inline_autocompletion|

chrome/browser/autocomplete/history_quick_provider.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/autocomplete/history_quick_provider.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 254 matching lines @@
       AutocompleteInput::FormattedStringWithEquivalentMeaning(info.url(),
           net::FormatUrlWithOffsets(info.url(), languages_, format_types,
               net::UnescapeRule::SPACES, NULL, NULL, &offsets));
   history::TermMatches new_matches =
       ReplaceOffsetsInTermMatches(history_match.url_matches, offsets);
   match.contents = net::FormatUrl(info.url(), languages_, format_types,
               net::UnescapeRule::SPACES, NULL, NULL, NULL);
   match.contents_class =
       SpansFromTermMatch(new_matches, match.contents.length(), true);
 
-  if (!history_match.can_inline) {
-    match.inline_autocomplete_offset = string16::npos;
-  } else {
+  if (history_match.can_inline) {
     DCHECK(!new_matches.empty());
-    match.inline_autocomplete_offset = new_matches[0].offset +
+    size_t inline_autocomplete_offset = new_matches[0].offset +
         new_matches[0].length;
     // The following will happen if the user has typed an URL with a scheme
     // and the last character typed is a slash because that slash is removed
     // by the FormatURLWithOffsets call above.
-    if (match.inline_autocomplete_offset > match.fill_into_edit.length())
-      match.inline_autocomplete_offset = match.fill_into_edit.length();
+    if (inline_autocomplete_offset > match.fill_into_edit.length())

[Peter Kasting, 2013/07/16 18:09:05]

Nit: How about just:

    if (inline_autocomplete_offset < match.fill_into_edit.length()) {
      match.inline_autocompletion =
          match.fill_into_edit.substr(inline_autocomplete_offset);
    }

This will require tweaking the comment ("|inline_autocomplete_offset| may be
beyond the end of the |fill_into_edit| if...").

[Mark P, 2013/07/16 18:53:23]

Good idea.  Don't know how I missed seeing that simplification.
Revised.

+      inline_autocomplete_offset = match.fill_into_edit.length();
+    match.inline_autocompletion =
+        match.fill_into_edit.substr(inline_autocomplete_offset);
   }
 
   // Format the description autocomplete presentation.
   match.description = info.title();
   match.description_class = SpansFromTermMatch(
       history_match.title_matches, match.description.length(), false);
 
   match.RecordAdditionalInfo("typed count", info.typed_count());
   match.RecordAdditionalInfo("visit count", info.visit_count());
   match.RecordAdditionalInfo("last visit", info.last_visit());
@@ skipping 37 matching lines @@
     do {
       offset += matches[i].length;
       ++i;
     } while ((i < match_count) && (offset == matches[i].offset));
     if (offset < text_length)
       spans.push_back(ACMatchClassification(offset, url_style));
   }
 
   return spans;
 }