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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 669573005: Add a class to parse answer json. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Respond to comments Created 6 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 unified diff | Download patch
« components/omnibox/autocomplete_match.h ('K') | « components/omnibox/autocomplete_match.h ('k') | components/omnibox/base_search_provider.cc » ('j') | components/omnibox/search_suggestion_parser.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/autocomplete_match.h" 5 #include "components/omnibox/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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 inline_autocompletion(match.inline_autocompletion), 72 inline_autocompletion(match.inline_autocompletion),
73 allowed_to_be_default_match(match.allowed_to_be_default_match), 73 allowed_to_be_default_match(match.allowed_to_be_default_match),
74 destination_url(match.destination_url), 74 destination_url(match.destination_url),
75 stripped_destination_url(match.stripped_destination_url), 75 stripped_destination_url(match.stripped_destination_url),
76 contents(match.contents), 76 contents(match.contents),
77 contents_class(match.contents_class), 77 contents_class(match.contents_class),
78 description(match.description), 78 description(match.description),
79 description_class(match.description_class), 79 description_class(match.description_class),
80 answer_contents(match.answer_contents), 80 answer_contents(match.answer_contents),
81 answer_type(match.answer_type), 81 answer_type(match.answer_type),
82 answer(match.answer),
82 transition(match.transition), 83 transition(match.transition),
83 is_history_what_you_typed_match(match.is_history_what_you_typed_match), 84 is_history_what_you_typed_match(match.is_history_what_you_typed_match),
84 type(match.type), 85 type(match.type),
85 associated_keyword(match.associated_keyword.get() ? 86 associated_keyword(match.associated_keyword.get() ?
86 new AutocompleteMatch(*match.associated_keyword) : NULL), 87 new AutocompleteMatch(*match.associated_keyword) : NULL),
87 keyword(match.keyword), 88 keyword(match.keyword),
88 from_previous(match.from_previous), 89 from_previous(match.from_previous),
89 search_terms_args(match.search_terms_args.get() ? 90 search_terms_args(match.search_terms_args.get() ?
90 new TemplateURLRef::SearchTermsArgs(*match.search_terms_args) : 91 new TemplateURLRef::SearchTermsArgs(*match.search_terms_args) :
91 NULL), 92 NULL),
(...skipping 17 matching lines...) Expand all
109 inline_autocompletion = match.inline_autocompletion; 110 inline_autocompletion = match.inline_autocompletion;
110 allowed_to_be_default_match = match.allowed_to_be_default_match; 111 allowed_to_be_default_match = match.allowed_to_be_default_match;
111 destination_url = match.destination_url; 112 destination_url = match.destination_url;
112 stripped_destination_url = match.stripped_destination_url; 113 stripped_destination_url = match.stripped_destination_url;
113 contents = match.contents; 114 contents = match.contents;
114 contents_class = match.contents_class; 115 contents_class = match.contents_class;
115 description = match.description; 116 description = match.description;
116 description_class = match.description_class; 117 description_class = match.description_class;
117 answer_contents = match.answer_contents; 118 answer_contents = match.answer_contents;
118 answer_type = match.answer_type; 119 answer_type = match.answer_type;
120 answer = match.answer;
119 transition = match.transition; 121 transition = match.transition;
120 is_history_what_you_typed_match = match.is_history_what_you_typed_match; 122 is_history_what_you_typed_match = match.is_history_what_you_typed_match;
121 type = match.type; 123 type = match.type;
122 associated_keyword.reset(match.associated_keyword.get() ? 124 associated_keyword.reset(match.associated_keyword.get() ?
123 new AutocompleteMatch(*match.associated_keyword) : NULL); 125 new AutocompleteMatch(*match.associated_keyword) : NULL);
124 keyword = match.keyword; 126 keyword = match.keyword;
125 from_previous = match.from_previous; 127 from_previous = match.from_previous;
126 search_terms_args.reset(match.search_terms_args.get() ? 128 search_terms_args.reset(match.search_terms_args.get() ?
127 new TemplateURLRef::SearchTermsArgs(*match.search_terms_args) : NULL); 129 new TemplateURLRef::SearchTermsArgs(*match.search_terms_args) : NULL);
128 additional_info = match.additional_info; 130 additional_info = match.additional_info;
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
534 << " is unsorted in relation to last offset of " << last_offset 536 << " is unsorted in relation to last offset of " << last_offset
535 << ". Provider: " << provider_name << "."; 537 << ". Provider: " << provider_name << ".";
536 DCHECK_LT(i->offset, text.length()) 538 DCHECK_LT(i->offset, text.length())
537 << " Classification of [" << i->offset << "," << text.length() 539 << " Classification of [" << i->offset << "," << text.length()
538 << "] is out of bounds for \"" << text << "\". Provider: " 540 << "] is out of bounds for \"" << text << "\". Provider: "
539 << provider_name << "."; 541 << provider_name << ".";
540 last_offset = i->offset; 542 last_offset = i->offset;
541 } 543 }
542 } 544 }
543 #endif 545 #endif
OLDNEW
« components/omnibox/autocomplete_match.h ('K') | « components/omnibox/autocomplete_match.h ('k') | components/omnibox/base_search_provider.cc » ('j') | components/omnibox/search_suggestion_parser.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698