Omnibox: Highlight Matches in URLs Properly

chrome/browser/bookmarks/bookmark_utils.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/bookmarks/bookmark_utils.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
@@ skipping 389 matching lines @@
 
   // Remove all the bookmarks.
   for (size_t i = 0; i < bookmarks.size(); ++i) {
     const BookmarkNode* node = bookmarks[i];
     int index = node->parent()->GetIndexOf(node);
     if (index > -1)
       model->Remove(node->parent(), index);
   }
 }
 
-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) {
   return base::i18n::ToLower(title.substr(0u, kCleanedUpTitleMaxLength));
 }
 
 }  // namespace bookmark_utils
 
 const BookmarkNode* GetBookmarkNodeByID(const BookmarkModel* model, int64 id) {
   // TODO(sky): TreeNode needs a method that visits all nodes using a predicate.
   return GetNodeByID(model->root_node(), id);
 }