components/web_contents_delegate_android/web_contents_delegate_android.cc - Issue 572013002: Removing ContentViewCore dependencies from direct WebContents functions.

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: components/web_contents_delegate_android/web_contents_delegate_android.cc

Issue 572013002: Removing ContentViewCore dependencies from direct WebContents functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed nits. Created 6 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

« components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java ('K') | « components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java ('k') | content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java » ('j') | content/public/android/javatests/src/org/chromium/content/browser/ContentViewTestBase.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/web_contents_delegate_android/web_contents_delegate_android.cc

diff --git a/components/web_contents_delegate_android/web_contents_delegate_android.cc b/components/web_contents_delegate_android/web_contents_delegate_android.cc

index c85896bde4c56550b17eea059006c661bf63eaf2..c00f28ac509a7c1fc3f0da2be28ac5b758543021 100644

--- a/components/web_contents_delegate_android/web_contents_delegate_android.cc

+++ b/components/web_contents_delegate_android/web_contents_delegate_android.cc

@@ -318,12 +318,11 @@ void WebContentsDelegateAndroid::ShowRepostFormWarningDialog(

ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);

if (obj.is_null())

return;

- ScopedJavaLocalRef<jobject> content_view_core =

- content::ContentViewCore::FromWebContents(source)->GetJavaObject();

- if (content_view_core.is_null())

+ ScopedJavaLocalRef<jobject> web_contents = source->GetJavaWebContents();

+ if (web_contents.is_null())

return;

Java_WebContentsDelegateAndroid_showRepostFormWarningDialog(env, obj.obj(),

- content_view_core.obj());

+ web_contents.obj());

}

void WebContentsDelegateAndroid::ToggleFullscreenModeForTab(