Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(336)

Side by Side Diff: components/omnibox/url_prefix.cc

Issue 1220653002: Fix some case-insensitive cases for StartsWith (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: grt's review comments, Mac fix Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/omnibox/url_prefix.h" 5 #include "components/omnibox/url_prefix.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/i18n/case_conversion.h"
8 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
9 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
10 11
11 namespace { 12 namespace {
12 13
13 // Like URLPrefix::BestURLPrefix() except also handles the prefix of 14 // Like URLPrefix::BestURLPrefix() except also handles the prefix of
14 // "www.". 15 // "www.".
15 const URLPrefix* BestURLPrefixWithWWWCase( 16 const URLPrefix* BestURLPrefixWithWWWCase(
16 const base::string16& text, 17 const base::string16& text,
17 const base::string16& prefix_suffix) { 18 const base::string16& prefix_suffix) {
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 for (URLPrefixes::const_iterator i = list.begin(); i != list.end(); ++i) 65 for (URLPrefixes::const_iterator i = list.begin(); i != list.end(); ++i)
65 if (PrefixMatch(*i, text, prefix_suffix)) 66 if (PrefixMatch(*i, text, prefix_suffix))
66 return &(*i); 67 return &(*i);
67 return NULL; 68 return NULL;
68 } 69 }
69 70
70 // static 71 // static
71 bool URLPrefix::PrefixMatch(const URLPrefix& prefix, 72 bool URLPrefix::PrefixMatch(const URLPrefix& prefix,
72 const base::string16& text, 73 const base::string16& text,
73 const base::string16& prefix_suffix) { 74 const base::string16& prefix_suffix) {
74 return base::StartsWith(text, prefix.prefix + prefix_suffix, false); 75 return base::StartsWith(
76 base::i18n::ToLower(text),
77 base::i18n::ToLower(prefix.prefix + prefix_suffix),
78 base::CompareCase::SENSITIVE);
75 } 79 }
76 80
77 // static 81 // static
78 size_t URLPrefix::GetInlineAutocompleteOffset( 82 size_t URLPrefix::GetInlineAutocompleteOffset(
79 const base::string16& input, 83 const base::string16& input,
80 const base::string16& fixed_up_input, 84 const base::string16& fixed_up_input,
81 const bool allow_www_prefix_without_scheme, 85 const bool allow_www_prefix_without_scheme,
82 const base::string16& text) { 86 const base::string16& text) {
83 const URLPrefix* best_prefix = allow_www_prefix_without_scheme ? 87 const URLPrefix* best_prefix = allow_www_prefix_without_scheme ?
84 BestURLPrefixWithWWWCase(text, input) : BestURLPrefix(text, input); 88 BestURLPrefixWithWWWCase(text, input) : BestURLPrefix(text, input);
85 const base::string16* matching_string = &input; 89 const base::string16* matching_string = &input;
86 // If we failed to find a best_prefix initially, try again using a fixed-up 90 // If we failed to find a best_prefix initially, try again using a fixed-up
87 // version of the user input. This is especially useful to get about: URLs 91 // version of the user input. This is especially useful to get about: URLs
88 // to inline against chrome:// shortcuts. (about: URLs are fixed up to the 92 // to inline against chrome:// shortcuts. (about: URLs are fixed up to the
89 // chrome:// scheme.) 93 // chrome:// scheme.)
90 if (!best_prefix && !fixed_up_input.empty() && (fixed_up_input != input)) { 94 if (!best_prefix && !fixed_up_input.empty() && (fixed_up_input != input)) {
91 best_prefix = allow_www_prefix_without_scheme ? 95 best_prefix = allow_www_prefix_without_scheme ?
92 BestURLPrefixWithWWWCase(text, fixed_up_input) : 96 BestURLPrefixWithWWWCase(text, fixed_up_input) :
93 BestURLPrefix(text, fixed_up_input); 97 BestURLPrefix(text, fixed_up_input);
94 matching_string = &fixed_up_input; 98 matching_string = &fixed_up_input;
95 } 99 }
96 return (best_prefix != NULL) ? 100 return (best_prefix != NULL) ?
97 (best_prefix->prefix.length() + matching_string->length()) : 101 (best_prefix->prefix.length() + matching_string->length()) :
98 base::string16::npos; 102 base::string16::npos;
99 } 103 }
OLDNEW
« no previous file with comments | « components/omnibox/suggestion_answer.cc ('k') | components/password_manager/core/browser/password_autofill_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698