summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete/autocomplete_match.h
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete_match.h')
-rw-r--r--chrome/browser/autocomplete/autocomplete_match.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_match.h b/chrome/browser/autocomplete/autocomplete_match.h
index 3296ac4..ca32458 100644
--- a/chrome/browser/autocomplete/autocomplete_match.h
+++ b/chrome/browser/autocomplete/autocomplete_match.h
@@ -144,6 +144,12 @@ struct AutocompleteMatch {
int style,
ACMatchClassifications* classifications);
+ // Returns a new vector of classifications containing the merged contents of
+ // |classifications1| and |classifications2|.
+ static ACMatchClassifications MergeClassifications(
+ const ACMatchClassifications& classifications1,
+ const ACMatchClassifications& classifications2);
+
// Converts classifications to and from a serialized string representation
// (using comma-separated integers to sequentially list positions and styles).
static std::string ClassificationsToString(