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

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 227653006: ContentView->ContentViewCore in Shell/ShellManager. (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

« no previous file with comments | « content/shell/android/java/src/org/chromium/content_shell/Shell.java ('k') | content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java » ('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/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 8004de0354d11168fee2996106513e6f173a22d5..1e1b9cc7855d95d0a5fe6b6274c32d78245bf3ca 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

@@ -17,8 +17,8 @@ import org.chromium.base.JNINamespace;

import org.chromium.base.ThreadUtils;

import org.chromium.content.browser.ActivityContentVideoViewClient;

import org.chromium.content.browser.ContentVideoViewClient;

-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.common.ContentSwitches;

import org.chromium.ui.base.WindowAndroid;

@@ -151,10 +151,10 @@ public class ShellManager extends FrameLayout {

addView(shellView, new FrameLayout.LayoutParams(

FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT));

mActiveShell = shellView;

- ContentView contentView = mActiveShell.getContentView();

- if (contentView != null) {

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

- contentView.getContentViewCore().onShow();

+ ContentViewCore contentViewCore = mActiveShell.getContentViewCore();

+ if (contentViewCore != null) {

+ mContentViewRenderView.setCurrentContentViewCore(contentViewCore);

+ contentViewCore.onShow();

}

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

private void removeShell(Shell shellView) {

if (shellView == mActiveShell) mActiveShell = null;

if (shellView.getParent() == null) return;

- ContentView contentView = shellView.getContentView();

- if (contentView != null) contentView.onHide();

+ ContentViewCore contentViewCore = shellView.getContentViewCore();

+ if (contentViewCore != null) contentViewCore.onHide();

shellView.setContentViewRenderView(null);

removeView(shellView);

}