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

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

Issue 19197005: Omnibox: Change |inline_autocomplete_offset| to |inline_autocompletion| (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix issue with using a reference in a place we shouldn't 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 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_MATCH_H_ 5 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_MATCH_H_
6 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_MATCH_H_ 6 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_MATCH_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 int typed_count; 239 int typed_count;
240 240
241 // True if the user should be able to delete this match. 241 // True if the user should be able to delete this match.
242 bool deletable; 242 bool deletable;
243 243
244 // This string is loaded into the location bar when the item is selected 244 // This string is loaded into the location bar when the item is selected
245 // by pressing the arrow keys. This may be different than a URL, for example, 245 // by pressing the arrow keys. This may be different than a URL, for example,
246 // for search suggestions, this would just be the search terms. 246 // for search suggestions, this would just be the search terms.
247 string16 fill_into_edit; 247 string16 fill_into_edit;
248 248
249 // The position within fill_into_edit from which we'll display the inline 249 // The text to display as a blue highlight selection after the cursor,
250 // autocomplete string. This will be string16::npos if this match should 250 // if this match is displayed inline (i.e., within the omnibox).
Peter Kasting 2013/07/16 18:09:05 Nit: Don't refer to "blue", that's a Windows-ism.
Mark P 2013/07/16 18:53:23 Okay. Done.
251 // not be inline autocompleted. 251 string16 inline_autocompletion;
252 size_t inline_autocomplete_offset;
253 252
254 // The URL to actually load when the autocomplete item is selected. This URL 253 // The URL to actually load when the autocomplete item is selected. This URL
255 // should be canonical so we can compare URLs with strcmp to avoid dupes. 254 // should be canonical so we can compare URLs with strcmp to avoid dupes.
256 // It may be empty if there is no possible navigation. 255 // It may be empty if there is no possible navigation.
257 GURL destination_url; 256 GURL destination_url;
258 257
259 // The destination URL with "www." stripped off for better dupe finding. 258 // The destination URL with "www." stripped off for better dupe finding.
260 GURL stripped_destination_url; 259 GURL stripped_destination_url;
261 260
262 // The main text displayed in the address bar dropdown. 261 // The main text displayed in the address bar dropdown.
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 const string16& text, 324 const string16& text,
326 const ACMatchClassifications& classifications) const; 325 const ACMatchClassifications& classifications) const;
327 #endif 326 #endif
328 }; 327 };
329 328
330 typedef AutocompleteMatch::ACMatchClassification ACMatchClassification; 329 typedef AutocompleteMatch::ACMatchClassification ACMatchClassification;
331 typedef std::vector<ACMatchClassification> ACMatchClassifications; 330 typedef std::vector<ACMatchClassification> ACMatchClassifications;
332 typedef std::vector<AutocompleteMatch> ACMatches; 331 typedef std::vector<AutocompleteMatch> ACMatches;
333 332
334 #endif // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_MATCH_H_ 333 #endif // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_MATCH_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698