content/shell/android/java/src/org/chromium/content_shell/ShellManager.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/ShellManager.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/shell/android/java/src/org/chromium/content_shell/Shell.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 6d6db1c98e96ad59be3eb2d7e158042d5eb53916..8004de0354d11168fee2996106513e6f173a22d5 100644

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

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

@@ -153,8 +153,8 @@ public class ShellManager extends FrameLayout {

mActiveShell = shellView;

ContentView contentView = mActiveShell.getContentView();

if (contentView != null) {

- mContentViewRenderView.setCurrentContentView(contentView);

- contentView.onShow();

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

+ contentView.getContentViewCore().onShow();

Yaron 2014/04/07 18:48:32 Oops. this bled in. No harm though for fixing now.

}