OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/autocomplete/autocomplete_match.h" | 5 #include "chrome/browser/autocomplete/autocomplete_match.h" |
6 | 6 |
7 #include "base/i18n/time_formatting.h" | 7 #include "base/i18n/time_formatting.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/strings/string16.h" | 9 #include "base/strings/string16.h" |
10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 deletable(match.deletable), | 74 deletable(match.deletable), |
75 fill_into_edit(match.fill_into_edit), | 75 fill_into_edit(match.fill_into_edit), |
76 inline_autocompletion(match.inline_autocompletion), | 76 inline_autocompletion(match.inline_autocompletion), |
77 allowed_to_be_default_match(match.allowed_to_be_default_match), | 77 allowed_to_be_default_match(match.allowed_to_be_default_match), |
78 destination_url(match.destination_url), | 78 destination_url(match.destination_url), |
79 stripped_destination_url(match.stripped_destination_url), | 79 stripped_destination_url(match.stripped_destination_url), |
80 contents(match.contents), | 80 contents(match.contents), |
81 contents_class(match.contents_class), | 81 contents_class(match.contents_class), |
82 description(match.description), | 82 description(match.description), |
83 description_class(match.description_class), | 83 description_class(match.description_class), |
| 84 answer_contents(match.answer_contents), |
| 85 answer_type(match.answer_type), |
84 transition(match.transition), | 86 transition(match.transition), |
85 is_history_what_you_typed_match(match.is_history_what_you_typed_match), | 87 is_history_what_you_typed_match(match.is_history_what_you_typed_match), |
86 type(match.type), | 88 type(match.type), |
87 associated_keyword(match.associated_keyword.get() ? | 89 associated_keyword(match.associated_keyword.get() ? |
88 new AutocompleteMatch(*match.associated_keyword) : NULL), | 90 new AutocompleteMatch(*match.associated_keyword) : NULL), |
89 keyword(match.keyword), | 91 keyword(match.keyword), |
90 starred(match.starred), | 92 starred(match.starred), |
91 from_previous(match.from_previous), | 93 from_previous(match.from_previous), |
92 search_terms_args(match.search_terms_args.get() ? | 94 search_terms_args(match.search_terms_args.get() ? |
93 new TemplateURLRef::SearchTermsArgs(*match.search_terms_args) : | 95 new TemplateURLRef::SearchTermsArgs(*match.search_terms_args) : |
(...skipping 16 matching lines...) Expand all Loading... |
110 deletable = match.deletable; | 112 deletable = match.deletable; |
111 fill_into_edit = match.fill_into_edit; | 113 fill_into_edit = match.fill_into_edit; |
112 inline_autocompletion = match.inline_autocompletion; | 114 inline_autocompletion = match.inline_autocompletion; |
113 allowed_to_be_default_match = match.allowed_to_be_default_match; | 115 allowed_to_be_default_match = match.allowed_to_be_default_match; |
114 destination_url = match.destination_url; | 116 destination_url = match.destination_url; |
115 stripped_destination_url = match.stripped_destination_url; | 117 stripped_destination_url = match.stripped_destination_url; |
116 contents = match.contents; | 118 contents = match.contents; |
117 contents_class = match.contents_class; | 119 contents_class = match.contents_class; |
118 description = match.description; | 120 description = match.description; |
119 description_class = match.description_class; | 121 description_class = match.description_class; |
| 122 answer_contents = match.answer_contents; |
| 123 answer_type = match.answer_type; |
120 transition = match.transition; | 124 transition = match.transition; |
121 is_history_what_you_typed_match = match.is_history_what_you_typed_match; | 125 is_history_what_you_typed_match = match.is_history_what_you_typed_match; |
122 type = match.type; | 126 type = match.type; |
123 associated_keyword.reset(match.associated_keyword.get() ? | 127 associated_keyword.reset(match.associated_keyword.get() ? |
124 new AutocompleteMatch(*match.associated_keyword) : NULL); | 128 new AutocompleteMatch(*match.associated_keyword) : NULL); |
125 keyword = match.keyword; | 129 keyword = match.keyword; |
126 starred = match.starred; | 130 starred = match.starred; |
127 from_previous = match.from_previous; | 131 from_previous = match.from_previous; |
128 search_terms_args.reset(match.search_terms_args.get() ? | 132 search_terms_args.reset(match.search_terms_args.get() ? |
129 new TemplateURLRef::SearchTermsArgs(*match.search_terms_args) : NULL); | 133 new TemplateURLRef::SearchTermsArgs(*match.search_terms_args) : NULL); |
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
498 << " is unsorted in relation to last offset of " << last_offset | 502 << " is unsorted in relation to last offset of " << last_offset |
499 << ". Provider: " << provider_name << "."; | 503 << ". Provider: " << provider_name << "."; |
500 DCHECK_LT(i->offset, text.length()) | 504 DCHECK_LT(i->offset, text.length()) |
501 << " Classification of [" << i->offset << "," << text.length() | 505 << " Classification of [" << i->offset << "," << text.length() |
502 << "] is out of bounds for \"" << text << "\". Provider: " | 506 << "] is out of bounds for \"" << text << "\". Provider: " |
503 << provider_name << "."; | 507 << provider_name << "."; |
504 last_offset = i->offset; | 508 last_offset = i->offset; |
505 } | 509 } |
506 } | 510 } |
507 #endif | 511 #endif |
OLD | NEW |