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

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

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 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
« no previous file with comments | « components/omnibox/DEPS ('k') | components/omnibox/autocomplete_match.cc » ('j') | no next file with comments »
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 #ifndef COMPONENTS_OMNIBOX_AUTOCOMPLETE_MATCH_H_ 5 #ifndef COMPONENTS_OMNIBOX_AUTOCOMPLETE_MATCH_H_
6 #define COMPONENTS_OMNIBOX_AUTOCOMPLETE_MATCH_H_ 6 #define COMPONENTS_OMNIBOX_AUTOCOMPLETE_MATCH_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "components/omnibox/autocomplete_match_type.h" 13 #include "components/omnibox/autocomplete_match_type.h"
14 #include "components/search_engines/template_url.h" 14 #include "components/search_engines/template_url.h"
15 #include "content/public/common/page_transition_types.h" 15 #include "ui/base/page_transition_types.h"
16 #include "url/gurl.h" 16 #include "url/gurl.h"
17 17
18 class AutocompleteProvider; 18 class AutocompleteProvider;
19 class TemplateURL; 19 class TemplateURL;
20 class TemplateURLService; 20 class TemplateURLService;
21 21
22 namespace base { 22 namespace base {
23 class Time; 23 class Time;
24 } // namespace base 24 } // namespace base
25 25
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 base::string16 description; 317 base::string16 description;
318 ACMatchClassifications description_class; 318 ACMatchClassifications description_class;
319 319
320 // A rich-format version of the display for the dropdown. 320 // A rich-format version of the display for the dropdown.
321 base::string16 answer_contents; 321 base::string16 answer_contents;
322 base::string16 answer_type; 322 base::string16 answer_type;
323 323
324 // The transition type to use when the user opens this match. By default 324 // The transition type to use when the user opens this match. By default
325 // this is TYPED. Providers whose matches do not look like URLs should set 325 // this is TYPED. Providers whose matches do not look like URLs should set
326 // it to GENERATED. 326 // it to GENERATED.
327 content::PageTransition transition; 327 ui::PageTransition transition;
328 328
329 // True when this match is the "what you typed" match from the history 329 // True when this match is the "what you typed" match from the history
330 // system. 330 // system.
331 bool is_history_what_you_typed_match; 331 bool is_history_what_you_typed_match;
332 332
333 // Type of this match. 333 // Type of this match.
334 Type type; 334 Type type;
335 335
336 // Set with a keyword provider match if this match can show a keyword hint. 336 // Set with a keyword provider match if this match can show a keyword hint.
337 // For example, if this is a SearchProvider match for "www.amazon.com", 337 // For example, if this is a SearchProvider match for "www.amazon.com",
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 const base::string16& text, 380 const base::string16& text,
381 const ACMatchClassifications& classifications) const; 381 const ACMatchClassifications& classifications) const;
382 #endif 382 #endif
383 }; 383 };
384 384
385 typedef AutocompleteMatch::ACMatchClassification ACMatchClassification; 385 typedef AutocompleteMatch::ACMatchClassification ACMatchClassification;
386 typedef std::vector<ACMatchClassification> ACMatchClassifications; 386 typedef std::vector<ACMatchClassification> ACMatchClassifications;
387 typedef std::vector<AutocompleteMatch> ACMatches; 387 typedef std::vector<AutocompleteMatch> ACMatches;
388 388
389 #endif // COMPONENTS_OMNIBOX_AUTOCOMPLETE_MATCH_H_ 389 #endif // COMPONENTS_OMNIBOX_AUTOCOMPLETE_MATCH_H_
OLDNEW
« no previous file with comments | « components/omnibox/DEPS ('k') | components/omnibox/autocomplete_match.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698