Omnibox: Highlight Matches in URLs Properly

chrome/browser/bookmarks/bookmark_utils.cc

Index: chrome/browser/bookmarks/bookmark_utils.cc
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc
index 4b4bcdd2d1e9753a91510fb20543f16e71a21a77..7611593f332038fe0301228372e2db07bede0729 100644
--- a/chrome/browser/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_utils.cc
@@ -407,13 +407,16 @@ void RemoveAllBookmarks(BookmarkModel* model, const GURL& url) {
   }
 }
 
-base::string16 CleanUpUrlForMatching(const GURL& gurl,
-                                     const std::string& languages) {
-  return base::i18n::ToLower(net::FormatUrl(
+base::string16 CleanUpUrlForMatching(
+    const GURL& gurl,
+    const std::string& languages,
+    base::OffsetAdjuster::Adjustments* adjustments) {
+  base::OffsetAdjuster::Adjustments tmp_adjustments;
+  return base::i18n::ToLower(net::FormatUrlWithAdjustments(
       GURL(TruncateUrl(gurl.spec())), languages,
       net::kFormatUrlOmitUsernamePassword,
       net::UnescapeRule::SPACES | net::UnescapeRule::URL_SPECIAL_CHARS,
-      NULL, NULL, NULL));
+      NULL, NULL, (adjustments != NULL) ? adjustments : &tmp_adjustments));

[Peter Kasting, 2014/04/24 21:00:52]

Nit: Could also just write "adjustments ? ..."

[Mark P, 2014/04/24 23:05:17]

Normally I tend to prefer the way I wrote it.
However, in this case the style in this file is to omit the NULL.
Now corrected.

 }
 
 base::string16 CleanUpTitleForMatching(const base::string16& title) {