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

Side by Side Diff: chrome/browser/autocomplete/autocomplete_match.cc

Issue 19197005: Omnibox: Change |inline_autocomplete_offset| to |inline_autocompletion| (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: drop user_text() in omnibox_edit_model Created 7 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 | Annotate | Revision Log
OLDNEW
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 25 matching lines...) Expand all
36 0x2028, // Line separator 36 0x2028, // Line separator
37 0x2029, // Paragraph separator 37 0x2029, // Paragraph separator
38 0 38 0
39 }; 39 };
40 40
41 AutocompleteMatch::AutocompleteMatch() 41 AutocompleteMatch::AutocompleteMatch()
42 : provider(NULL), 42 : provider(NULL),
43 relevance(0), 43 relevance(0),
44 typed_count(-1), 44 typed_count(-1),
45 deletable(false), 45 deletable(false),
46 inline_autocomplete_offset(string16::npos),
47 transition(content::PAGE_TRANSITION_GENERATED), 46 transition(content::PAGE_TRANSITION_GENERATED),
48 is_history_what_you_typed_match(false), 47 is_history_what_you_typed_match(false),
49 type(AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED), 48 type(AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED),
50 starred(false), 49 starred(false),
51 from_previous(false) { 50 from_previous(false) {
52 } 51 }
53 52
54 AutocompleteMatch::AutocompleteMatch(AutocompleteProvider* provider, 53 AutocompleteMatch::AutocompleteMatch(AutocompleteProvider* provider,
55 int relevance, 54 int relevance,
56 bool deletable, 55 bool deletable,
57 Type type) 56 Type type)
58 : provider(provider), 57 : provider(provider),
59 relevance(relevance), 58 relevance(relevance),
60 typed_count(-1), 59 typed_count(-1),
61 deletable(deletable), 60 deletable(deletable),
62 inline_autocomplete_offset(string16::npos),
63 transition(content::PAGE_TRANSITION_TYPED), 61 transition(content::PAGE_TRANSITION_TYPED),
64 is_history_what_you_typed_match(false), 62 is_history_what_you_typed_match(false),
65 type(type), 63 type(type),
66 starred(false), 64 starred(false),
67 from_previous(false) { 65 from_previous(false) {
68 } 66 }
69 67
70 AutocompleteMatch::AutocompleteMatch(const AutocompleteMatch& match) 68 AutocompleteMatch::AutocompleteMatch(const AutocompleteMatch& match)
71 : provider(match.provider), 69 : provider(match.provider),
72 relevance(match.relevance), 70 relevance(match.relevance),
73 typed_count(match.typed_count), 71 typed_count(match.typed_count),
74 deletable(match.deletable), 72 deletable(match.deletable),
75 fill_into_edit(match.fill_into_edit), 73 fill_into_edit(match.fill_into_edit),
76 inline_autocomplete_offset(match.inline_autocomplete_offset), 74 inline_autocompletion(match.inline_autocompletion),
77 destination_url(match.destination_url), 75 destination_url(match.destination_url),
78 stripped_destination_url(match.stripped_destination_url), 76 stripped_destination_url(match.stripped_destination_url),
79 contents(match.contents), 77 contents(match.contents),
80 contents_class(match.contents_class), 78 contents_class(match.contents_class),
81 description(match.description), 79 description(match.description),
82 description_class(match.description_class), 80 description_class(match.description_class),
83 transition(match.transition), 81 transition(match.transition),
84 is_history_what_you_typed_match(match.is_history_what_you_typed_match), 82 is_history_what_you_typed_match(match.is_history_what_you_typed_match),
85 type(match.type), 83 type(match.type),
86 associated_keyword(match.associated_keyword.get() ? 84 associated_keyword(match.associated_keyword.get() ?
(...skipping 13 matching lines...) Expand all
100 AutocompleteMatch& AutocompleteMatch::operator=( 98 AutocompleteMatch& AutocompleteMatch::operator=(
101 const AutocompleteMatch& match) { 99 const AutocompleteMatch& match) {
102 if (this == &match) 100 if (this == &match)
103 return *this; 101 return *this;
104 102
105 provider = match.provider; 103 provider = match.provider;
106 relevance = match.relevance; 104 relevance = match.relevance;
107 typed_count = match.typed_count; 105 typed_count = match.typed_count;
108 deletable = match.deletable; 106 deletable = match.deletable;
109 fill_into_edit = match.fill_into_edit; 107 fill_into_edit = match.fill_into_edit;
110 inline_autocomplete_offset = match.inline_autocomplete_offset; 108 inline_autocompletion = match.inline_autocompletion;
111 destination_url = match.destination_url; 109 destination_url = match.destination_url;
112 stripped_destination_url = match.stripped_destination_url; 110 stripped_destination_url = match.stripped_destination_url;
113 contents = match.contents; 111 contents = match.contents;
114 contents_class = match.contents_class; 112 contents_class = match.contents_class;
115 description = match.description; 113 description = match.description;
116 description_class = match.description_class; 114 description_class = match.description_class;
117 transition = match.transition; 115 transition = match.transition;
118 is_history_what_you_typed_match = match.is_history_what_you_typed_match; 116 is_history_what_you_typed_match = match.is_history_what_you_typed_match;
119 type = match.type; 117 type = match.type;
120 associated_keyword.reset(match.associated_keyword.get() ? 118 associated_keyword.reset(match.associated_keyword.get() ?
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 << " is unsorted in relation to last offset of " << last_offset 471 << " is unsorted in relation to last offset of " << last_offset
474 << ". Provider: " << provider_name << "."; 472 << ". Provider: " << provider_name << ".";
475 DCHECK_LT(i->offset, text.length()) 473 DCHECK_LT(i->offset, text.length())
476 << " Classification of [" << i->offset << "," << text.length() 474 << " Classification of [" << i->offset << "," << text.length()
477 << "] is out of bounds for \"" << text << "\". Provider: " 475 << "] is out of bounds for \"" << text << "\". Provider: "
478 << provider_name << "."; 476 << provider_name << ".";
479 last_offset = i->offset; 477 last_offset = i->offset;
480 } 478 }
481 } 479 }
482 #endif 480 #endif
OLDNEW
« no previous file with comments | « chrome/browser/autocomplete/autocomplete_match.h ('k') | chrome/browser/autocomplete/contact_provider_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698