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

Unified Diff: chrome/browser/autocomplete/autocomplete_edit.cc

Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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
Index: chrome/browser/autocomplete/autocomplete_edit.cc
===================================================================
--- chrome/browser/autocomplete/autocomplete_edit.cc (revision 105162)
+++ chrome/browser/autocomplete/autocomplete_edit.cc (working copy)
@@ -319,7 +319,7 @@
AutocompleteMatch match;
GetInfoForCurrentText(&match, NULL);
- return match.transition == PageTransition::TYPED;
+ return match.transition == content::PAGE_TRANSITION_TYPED;
}
AutocompleteMatch::Type AutocompleteEditModel::CurrentTextType() const {
@@ -354,7 +354,7 @@
AutocompleteMatch match;
profile_->GetAutocompleteClassifier()->Classify(*text, string16(),
KeywordIsSelected(), true, &match, NULL);
- if (match.transition != PageTransition::TYPED)
+ if (match.transition != content::PAGE_TRANSITION_TYPED)
return;
*url = match.destination_url;
@@ -448,8 +448,9 @@
if (!match.destination_url.is_valid())
return;
- if ((match.transition == PageTransition::TYPED) && (match.destination_url ==
- URLFixerUpper::FixupURL(UTF16ToUTF8(permanent_text_), std::string()))) {
+ if ((match.transition == content::PAGE_TRANSITION_TYPED) &&
+ (match.destination_url ==
+ URLFixerUpper::FixupURL(UTF16ToUTF8(permanent_text_), std::string()))) {
// When the user hit enter on the existing permanent URL, treat it like a
// reload for scoring purposes. We could detect this by just checking
// user_input_in_progress_, but it seems better to treat "edits" that end
@@ -459,13 +460,13 @@
// different from the current URL, even if it wound up at the same place
// (e.g. manually retyping the same search query), and it seems wrong to
// treat this as a reload.
- match.transition = PageTransition::RELOAD;
+ match.transition = content::PAGE_TRANSITION_RELOAD;
} else if (for_drop || ((paste_state_ != NONE) &&
match.is_history_what_you_typed_match)) {
// When the user pasted in a URL and hit enter, score it like a link click
// rather than a normal typed URL, so it doesn't get inline autocompleted
// as aggressively later.
- match.transition = PageTransition::LINK;
+ match.transition = content::PAGE_TRANSITION_LINK;
}
if (match.template_url && match.template_url->url() &&
@@ -532,8 +533,8 @@
UserMetrics::RecordAction(UserMetricsAction("AcceptedKeyword"));
template_url_service->IncrementUsageCount(template_url);
- if (match.transition == PageTransition::KEYWORD ||
- match.transition == PageTransition::KEYWORD_GENERATED) {
+ if (match.transition == content::PAGE_TRANSITION_KEYWORD ||
+ match.transition == content::PAGE_TRANSITION_KEYWORD_GENERATED) {
// NOTE: Non-prepopulated engines will all have ID 0, which is fine as
// the prepopulate IDs start at 1. Distribution-specific engines will
// all have IDs above the maximum, and will be automatically lumped
@@ -548,7 +549,8 @@
// search engine, if applicable; see comments in template_url.h.
}
- if (match.transition == PageTransition::GENERATED && match.template_url) {
+ if (match.transition == content::PAGE_TRANSITION_GENERATED &&
+ match.template_url) {
// See comment above.
UMA_HISTOGRAM_ENUMERATION(
"Omnibox.SearchEngine", match.template_url->prepopulate_id(),
« no previous file with comments | « chrome/browser/autocomplete/autocomplete_edit.h ('k') | chrome/browser/autocomplete/autocomplete_edit_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698