Move PageTransition into content namespace. While I'm touching all these files, I've also updated it to use the enum naming convention in the Content API.
BUG=98716
Review URL: http://codereview.chromium.org/8253002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105254 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc
index 018d20e4..240e969 100644
--- a/chrome/browser/autocomplete/search_provider.cc
+++ b/chrome/browser/autocomplete/search_provider.cc
@@ -686,7 +686,8 @@
if (!prevent_inline_autocomplete && classifier && (i->term != input_text)) {
AutocompleteMatch match;
classifier->Classify(i->term, string16(), false, false, &match, NULL);
- prevent_inline_autocomplete = match.transition == PageTransition::TYPED;
+ prevent_inline_autocomplete =
+ match.transition == content::PAGE_TRANSITION_TYPED;
}
int relevance = CalculateRelevanceForHistory(i->time, is_keyword,
@@ -887,8 +888,8 @@
profile_, provider, query_string, accepted_suggestion, input_text));
// Search results don't look like URLs.
- match.transition =
- is_keyword ? PageTransition::KEYWORD : PageTransition::GENERATED;
+ match.transition = is_keyword ?
+ content::PAGE_TRANSITION_KEYWORD : content::PAGE_TRANSITION_GENERATED;
// Try to add |match| to |map|. If a match for |query_string| is already in
// |map|, replace it if |match| is more relevant.
