content/browser/android/web_contents_observer_android.cc - Issue 562603002: Move PageTransition from //content/public/common to //ui/base

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/android/web_contents_observer_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 | « content/browser/android/web_contents_observer_android.h ('k') | content/browser/browser_plugin/browser_plugin_guest.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/android/web_contents_observer_android.cc

diff --git a/content/browser/android/web_contents_observer_android.cc b/content/browser/android/web_contents_observer_android.cc

index 708e7bfa8fd284bd7ae46d52fb62e539b86d9042..237abd6f6e34180d1e28ae36b23abba5bc5cdeb5 100644

--- a/content/browser/android/web_contents_observer_android.cc

+++ b/content/browser/android/web_contents_observer_android.cc

@@ -164,8 +164,8 @@ void WebContentsObserverAndroid::DidNavigateAnyFrame(

ConvertUTF8ToJavaString(env, params.url.spec()));

ScopedJavaLocalRef<jstring> jstring_base_url(

ConvertUTF8ToJavaString(env, params.base_url.spec()));

- jboolean jboolean_is_reload =

- PageTransitionCoreTypeIs(params.transition, PAGE_TRANSITION_RELOAD);

+ jboolean jboolean_is_reload = ui::PageTransitionCoreTypeIs(

+ params.transition, ui::PAGE_TRANSITION_RELOAD);

Java_WebContentsObserverAndroid_didNavigateAnyFrame(

env, obj.obj(), jstring_url.obj(), jstring_base_url.obj(),

@@ -201,7 +201,7 @@ void WebContentsObserverAndroid::DidStartProvisionalLoadForFrame(

void WebContentsObserverAndroid::DidCommitProvisionalLoadForFrame(

RenderFrameHost* render_frame_host,

const GURL& url,

- PageTransition transition_type) {

+ ui::PageTransition transition_type) {

JNIEnv* env = AttachCurrentThread();

ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env));

if (obj.is_null())

« no previous file with comments | « content/browser/android/web_contents_observer_android.h ('k') | content/browser/browser_plugin/browser_plugin_guest.h » ('j') | no next file with comments »