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

Unified Diff: chrome/browser/android/tab_android.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 | « athena/content/render_view_context_menu_impl.cc ('k') | chrome/browser/apps/app_browsertest_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/tab_android.cc
diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc
index e56e5e949b40b243d0096184319dbe7ae2f5de54..05fa32f328eaab26a8c8c5043d91e8ae8193e762 100644
--- a/chrome/browser/android/tab_android.cc
+++ b/chrome/browser/android/tab_android.cc
@@ -511,7 +511,7 @@ TabAndroid::TabLoadStatus TabAndroid::LoadUrl(JNIEnv* env,
// GoogleURLTracker uses the navigation pending notification to trigger the
// infobar.
if (google_util::IsGoogleSearchUrl(fixed_url) &&
- (page_transition & content::PAGE_TRANSITION_GENERATED)) {
+ (page_transition & ui::PAGE_TRANSITION_GENERATED)) {
GoogleURLTracker* tracker =
GoogleURLTrackerFactory::GetForProfile(GetProfile());
if (tracker)
@@ -539,7 +539,7 @@ TabAndroid::TabLoadStatus TabAndroid::LoadUrl(JNIEnv* env,
base::RefCountedBytes::TakeVector(&post_data);
}
load_params.transition_type =
- content::PageTransitionFromInt(page_transition);
+ ui::PageTransitionFromInt(page_transition);
if (j_referrer_url) {
load_params.referrer = content::Referrer(
GURL(base::android::ConvertJavaStringToUTF8(env, j_referrer_url)),
« no previous file with comments | « athena/content/render_view_context_menu_impl.cc ('k') | chrome/browser/apps/app_browsertest_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698