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

Unified Diff: chrome/browser/autocomplete/autocomplete_match.cc

Issue 8502027: Fix AutocompleteMatch DCHECK() triggered by |RenderViewContextMenu::AppendSearchProvider()|. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/autocomplete/autocomplete_match.cc
===================================================================
--- chrome/browser/autocomplete/autocomplete_match.cc (revision 108864)
+++ chrome/browser/autocomplete/autocomplete_match.cc (working copy)
@@ -9,6 +9,14 @@
// AutocompleteMatch ----------------------------------------------------------
+// static
+const char16 AutocompleteMatch::kInvalidChars[] = {
+ '\n', '\r', '\t',
+ 0x2028, // Line separator
+ 0x2029, // Paragraph separator
+ 0
+};
+
AutocompleteMatch::AutocompleteMatch()
: provider(NULL),
relevance(0),
@@ -161,14 +169,9 @@
string16 AutocompleteMatch::SanitizeString(const string16& text) {
// NOTE: This logic is mirrored by |sanitizeString()| in
// extension_process_bindings.js.
- // 0x2028 = line separator; 0x2029 = paragraph separator.
- const char16 kRemoveChars[] = { '\n', '\r', '\t',
- 0x2028, // Line separator
- 0x2029, // Paragraph separator
- 0 };
string16 result;
TrimWhitespace(text, TRIM_LEADING, &result);
- RemoveChars(result, kRemoveChars, &result);
+ RemoveChars(result, kInvalidChars, &result);
return result;
}
« no previous file with comments | « chrome/browser/autocomplete/autocomplete_match.h ('k') | chrome/browser/tab_contents/render_view_context_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698