android_webview/java/src/org/chromium/android_webview/AwContents.java - Issue 786933005: [Android] Add proxy for Java-based WebContentsObservers

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: android_webview/java/src/org/chromium/android_webview/AwContents.java

Issue 786933005: [Android] Add proxy for Java-based WebContentsObservers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Code review Created 5 years, 10 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 | « no previous file | android_webview/java/src/org/chromium/android_webview/AwWebContentsObserver.java » ('j') | content/browser/android/web_contents_observer_proxy.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/java/src/org/chromium/android_webview/AwContents.java

diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java

index e53f4f7c588fb04098f747414d06cf009732333a..784793d405128490f90150fae49eb4125596376d 100644

--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java

+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java

@@ -49,7 +49,6 @@ import org.chromium.content.browser.ContentViewClient;

import org.chromium.content.browser.ContentViewCore;

import org.chromium.content.browser.ContentViewStatics;

import org.chromium.content.browser.SmartClipProvider;

-import org.chromium.content.browser.WebContentsObserver;

import org.chromium.content.common.CleanupReference;

import org.chromium.content_public.browser.GestureStateListener;

import org.chromium.content_public.browser.JavaScriptCallback;

@@ -57,6 +56,7 @@ import org.chromium.content_public.browser.LoadUrlParams;

import org.chromium.content_public.browser.NavigationController;

import org.chromium.content_public.browser.NavigationHistory;

import org.chromium.content_public.browser.WebContents;

+import org.chromium.content_public.browser.WebContentsObserver;

import org.chromium.content_public.browser.navigation_controller.LoadURLType;

import org.chromium.content_public.browser.navigation_controller.UserAgentOverrideOption;

import org.chromium.content_public.common.Referrer;

@@ -843,7 +843,7 @@ public class AwContents implements SmartClipProvider,

private void installWebContentsObserver() {

if (mWebContentsObserver != null) {

- mWebContentsObserver.detachFromWebContents();

+ mWebContentsObserver.destroy();

}

mWebContentsObserver = new AwWebContentsObserver(mWebContents, mContentsClient);

}

@@ -951,7 +951,7 @@ public class AwContents implements SmartClipProvider,

if (mCleanupReference != null) {

assert mNativeAwContents != 0;

- mWebContentsObserver.detachFromWebContents();

+ mWebContentsObserver.destroy();

mWebContentsObserver = null;

mContentViewCore.destroy();

mContentViewCore = null;