content/shell/android/java/src/org/chromium/content_shell/Shell.java - Issue 2103243002: Factor out ContentViewAndroidDelegate

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/android/java/src/org/chromium/content_shell/Shell.java

Issue 2103243002: Factor out ContentViewAndroidDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed comments Created 4 years, 5 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

« content/public/android/java/src/org/chromium/content/browser/ContentViewAndroidDelegate.java ('K') | « content/public/android/javatests/src/org/chromium/content/browser/ContentViewCoreViewAndroidDelegateTest.java ('k') | device/power_save_blocker/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/android/java/src/org/chromium/content_shell/Shell.java

diff --git a/content/shell/android/java/src/org/chromium/content_shell/Shell.java b/content/shell/android/java/src/org/chromium/content_shell/Shell.java

index 74ec6ab8c93e381e6ab8110c358df86352c05d81..03e9d0316d2e4e9760e79b79ae1a9e803a4e43a5 100644

--- a/content/shell/android/java/src/org/chromium/content_shell/Shell.java

+++ b/content/shell/android/java/src/org/chromium/content_shell/Shell.java

@@ -23,6 +23,7 @@ import android.widget.TextView.OnEditorActionListener;

import org.chromium.base.annotations.CalledByNative;

import org.chromium.base.annotations.JNINamespace;

import org.chromium.content.browser.ContentView;

+import org.chromium.content.browser.ContentViewAndroidDelegate;

import org.chromium.content.browser.ContentViewClient;

import org.chromium.content.browser.ContentViewCore;

import org.chromium.content.browser.ContentViewRenderView;

@@ -288,7 +289,9 @@ public class Shell extends LinearLayout {

Context context = getContext();

mContentViewCore = new ContentViewCore(context);

ContentView cv = ContentView.createContentView(context, mContentViewCore);

- mContentViewCore.initialize(cv, cv, webContents, mWindow);

+ ContentViewAndroidDelegate viewDelegate = new ContentViewAndroidDelegate(

+ cv, mContentViewCore.getRenderCoordinates());

+ mContentViewCore.initialize(cv, viewDelegate, cv, webContents, mWindow);

mContentViewCore.setContentViewClient(mContentViewClient);

mWebContents = mContentViewCore.getWebContents();

mNavigationController = mWebContents.getNavigationController();