content/shell/android/java/src/org/chromium/content_shell/Shell.java - Issue 227803004: ContentView->ContentViewCore in ContentViewRenderView

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 227803004: ContentView->ContentViewCore in ContentViewRenderView (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 8 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

« chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellUrlTest.java ('K') | « content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java ('k') | content/shell/android/java/src/org/chromium/content_shell/ShellManager.java » ('j') | content/shell/android/java/src/org/chromium/content_shell/ShellManager.java » ('J')
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 5ac955f721336f1ce50364ada65d9e6e2264e1de..ef42b2015781b828d26c32f2f02b8a8028671826 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 org.chromium.base.CalledByNative;

import org.chromium.base.JNINamespace;

import org.chromium.content.browser.ContentView;

import org.chromium.content.browser.ContentViewClient;

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

import org.chromium.content.browser.ContentViewRenderView;

import org.chromium.content.browser.LoadUrlParams;

import org.chromium.ui.base.WindowAndroid;

@@ -259,7 +260,7 @@ public class Shell extends LinearLayout {

FrameLayout.LayoutParams.MATCH_PARENT,

FrameLayout.LayoutParams.MATCH_PARENT));

mContentView.requestFocus();

- mContentViewRenderView.setCurrentContentView(mContentView);

+ mContentViewRenderView.setCurrentContentViewCore(mContentView.getContentViewCore());

}

/**