content/shell/browser/shell_android.cc - Issue 831523005: Remove most native WebContents references from Java

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/shell/browser/shell_android.cc

Issue 831523005: Remove most native WebContents references from Java (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Kept same error checking behavior for aw_contents.cc Created 5 years, 11 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:

Index: content/shell/browser/shell_android.cc

diff --git a/content/shell/browser/shell_android.cc b/content/shell/browser/shell_android.cc

index 65a775c6915be4d3dbf124ccc629811cca04c643..85e4079428dc78edc9b759b6d42d37e60571239a 100644

--- a/content/shell/browser/shell_android.cc

+++ b/content/shell/browser/shell_android.cc

@@ -11,6 +11,7 @@

#include "base/command_line.h"

#include "base/logging.h"

#include "base/strings/string_piece.h"

+#include "content/public/browser/web_contents.h"

#include "content/public/common/content_switches.h"

#include "content/shell/android/shell_manager.h"

#include "jni/Shell_jni.h"

@@ -58,7 +59,7 @@ void Shell::PlatformCreateWindow(int width, int height) {

void Shell::PlatformSetContents() {

JNIEnv* env = AttachCurrentThread();

Java_Shell_initFromNativeTabContents(

- env, java_object_.obj(), reinterpret_cast<intptr_t>(web_contents()));

+ env, java_object_.obj(), web_contents()->GetJavaWebContents().obj());

}

void Shell::PlatformResizeSubViews() {