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

Unified Diff: components/omnibox/autocomplete_match.cc

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/omnibox/autocomplete_match.h ('k') | components/omnibox/autocomplete_result.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/omnibox/autocomplete_match.cc
diff --git a/components/omnibox/autocomplete_match.cc b/components/omnibox/autocomplete_match.cc
index f1c31f2346a299c9acaec287ff46ea4ac0e258c2..8a73913fe0290d1956239b681c31a1c62b344bf1 100644
--- a/components/omnibox/autocomplete_match.cc
+++ b/components/omnibox/autocomplete_match.cc
@@ -42,7 +42,7 @@ AutocompleteMatch::AutocompleteMatch()
typed_count(-1),
deletable(false),
allowed_to_be_default_match(false),
- transition(content::PAGE_TRANSITION_GENERATED),
+ transition(ui::PAGE_TRANSITION_GENERATED),
is_history_what_you_typed_match(false),
type(AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED),
from_previous(false) {
@@ -57,7 +57,7 @@ AutocompleteMatch::AutocompleteMatch(AutocompleteProvider* provider,
typed_count(-1),
deletable(deletable),
allowed_to_be_default_match(false),
- transition(content::PAGE_TRANSITION_TYPED),
+ transition(ui::PAGE_TRANSITION_TYPED),
is_history_what_you_typed_match(false),
type(type),
from_previous(false) {
@@ -435,7 +435,7 @@ void AutocompleteMatch::GetKeywordUIState(
base::string16 AutocompleteMatch::GetSubstitutingExplicitlyInvokedKeyword(
TemplateURLService* template_url_service) const {
- if (transition != content::PAGE_TRANSITION_KEYWORD ||
+ if (transition != ui::PAGE_TRANSITION_KEYWORD ||
template_url_service == NULL) {
return base::string16();
}
« no previous file with comments | « components/omnibox/autocomplete_match.h ('k') | components/omnibox/autocomplete_result.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698