Omnibox: Make URLs of Bookmarks Searchable

chrome/browser/autocomplete/url_prefix.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/url_prefix.h"
 
 #include "base/basictypes.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
@@ skipping 59 matching lines @@
 }
 
 // static
 bool URLPrefix::PrefixMatch(const URLPrefix& prefix,
                             const base::string16& text,
                             const base::string16& prefix_suffix) {
   return StartsWith(text, prefix.prefix + prefix_suffix, false);
 }
 
 // static
-void URLPrefix::ComputeMatchStartAndInlineAutocompleteOffset(
+size_t URLPrefix::GetInlineAutocompleteOffset(
     const AutocompleteInput& input,
     const AutocompleteInput& fixed_up_input,
     const bool allow_www_prefix_without_scheme,
-    const base::string16& text,
-    size_t* match_start,
-    size_t* inline_autocomplete_offset) {
+    const base::string16& text) {
   const URLPrefix* best_prefix = allow_www_prefix_without_scheme ?
       BestURLPrefixWithWWWCase(text, input.text()) :
       BestURLPrefix(text, input.text());
   const base::string16* matching_string = &input.text();
   // If we failed to find a best_prefix initially, try again using a fixed-up
   // version of the user input.  This is especially useful to get about: URLs
   // to inline against chrome:// shortcuts.  (about: URLs are fixed up to the
   // chrome:// scheme.)
   if ((best_prefix == NULL) && !fixed_up_input.text().empty() &&
       (fixed_up_input.text() != input.text())) {
     best_prefix = allow_www_prefix_without_scheme ?
         BestURLPrefixWithWWWCase(text, fixed_up_input.text()) :
         BestURLPrefix(text, fixed_up_input.text());
     matching_string = &fixed_up_input.text();
   }
-  if (best_prefix != NULL) {
-    *match_start = best_prefix->prefix.length();
-    *inline_autocomplete_offset =
-        best_prefix->prefix.length() + matching_string->length();
-  } else {
-    *match_start = base::string16::npos;
-    *inline_autocomplete_offset = base::string16::npos;
-  }
+  return (best_prefix != NULL) ?
+      (best_prefix->prefix.length() + matching_string->length()) :
+      base::string16::npos;
 }