Omnibox: Fix to Display Bookmarks With Leading Spaces

chrome/browser/autocomplete/bookmark_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/bookmark_provider.h"
 
 #include <algorithm>
 #include <functional>
 #include <vector>
 
 #include "base/prefs/pref_service.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
 #include "chrome/browser/autocomplete/history_provider.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "components/bookmarks/browser/bookmark_match.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/metrics/proto/omnibox_input_type.pb.h"
 #include "components/omnibox/autocomplete_result.h"
 #include "components/omnibox/omnibox_field_trial.h"
 #include "components/omnibox/url_prefix.h"
 #include "net/base/net_util.h"
 
 using bookmarks::BookmarkMatch;
 
 typedef std::vector<BookmarkMatch> BookmarkMatches;
 
+namespace {
+
+// Remove leading spaces from |title| before displaying, otherwise it looks

[Peter Kasting, 2014/08/25 19:46:44]

Nit: Remove -> Removes; correct -> corrects

[Mark P, 2014/08/25 19:51:16]

Both done.

+// funny.  In the process, correct |title_match_positions| so the correct
+// characters are highlighted.
+void CorrectTitleAndMatchPositions(
+    base::string16* title,
+    BookmarkMatch::MatchPositions* title_match_positions) {
+  base::string16 trimmed_title;

[Peter Kasting, 2014/08/25 19:46:44]

Nit: Saves the assignment later:

  size_t correction = title->length();
  base::TrimWhitespace(*title, base::TRIM_LEADING, title);
  correction -= title->length();

[Mark P, 2014/08/25 19:51:16]

Too much less readable, not worth it to save one short string copy.

+  base::TrimWhitespace(*title, base::TRIM_LEADING, &trimmed_title);
+  const size_t correction = title->length() - trimmed_title.length();
+  if (correction == 0)
+    return;
+  (*title) = trimmed_title;
+  for (query_parser::Snippet::MatchPositions::iterator it =
+           title_match_positions->begin();
+       it != title_match_positions->end(); ++it) {
+    (*it) = query_parser::Snippet::MatchPosition(
+        it->first - correction, it->second - correction);
+  }
+}
+
+}  // namespace
+
 // BookmarkProvider ------------------------------------------------------------
 
 BookmarkProvider::BookmarkProvider(Profile* profile)
     : AutocompleteProvider(AutocompleteProvider::TYPE_BOOKMARK),
       profile_(profile),
       bookmark_model_(NULL),
       score_using_url_matches_(OmniboxFieldTrial::BookmarksIndexURLsValue()) {
   if (profile) {
     bookmark_model_ = BookmarkModelFactory::GetForProfile(profile);
     languages_ = profile_->GetPrefs()->GetString(prefs::kAcceptLanguages);
@@ skipping 100 matching lines @@
 AutocompleteMatch BookmarkProvider::BookmarkMatchToACMatch(
     const AutocompleteInput& input,
     const base::string16& fixed_up_input_text,
     const BookmarkMatch& bookmark_match) {
   // The AutocompleteMatch we construct is non-deletable because the only
   // way to support this would be to delete the underlying bookmark, which is
   // unlikely to be what the user intends.
   AutocompleteMatch match(this, 0, false,
                           AutocompleteMatchType::BOOKMARK_TITLE);
   base::string16 title(bookmark_match.node->GetTitle());
+  BookmarkMatch::MatchPositions new_title_match_positions =
+      bookmark_match.title_match_positions;
+  CorrectTitleAndMatchPositions(&title, &new_title_match_positions);
   const GURL& url(bookmark_match.node->url());
   const base::string16& url_utf16 = base::UTF8ToUTF16(url.spec());
   size_t inline_autocomplete_offset = URLPrefix::GetInlineAutocompleteOffset(
       input.text(), fixed_up_input_text, false, url_utf16);
   match.destination_url = url;
   const size_t match_start = bookmark_match.url_match_positions.empty() ?
       0 : bookmark_match.url_match_positions[0].first;
   const bool trim_http = !AutocompleteInput::HasHTTPScheme(input.text()) &&
       ((match_start == base::string16::npos) || (match_start != 0));
   std::vector<size_t> offsets = BookmarkMatch::OffsetsFromMatchPositions(
@@ skipping 150 matching lines @@
        i != positions.end();
        ++i) {
     AutocompleteMatch::ACMatchClassifications new_class;
     AutocompleteMatch::ClassifyLocationInString(i->first, i->second - i->first,
         text_length, url_style, &new_class);
     classifications = AutocompleteMatch::MergeClassifications(
         classifications, new_class);
   }
   return classifications;
 }