Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3625)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/Tab.java

Issue 786933005: [Android] Add proxy for Java-based WebContentsObservers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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
Index: chrome/android/java/src/org/chromium/chrome/browser/Tab.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/Tab.java b/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
index 991fca08a0f25c74824ed30b0c5ee779d62b5d85..cf04a0de78b146efd315524eb3979f62777cf99b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
@@ -49,10 +49,10 @@ import org.chromium.components.navigation_interception.InterceptNavigationDelega
import org.chromium.content.browser.ContentView;
import org.chromium.content.browser.ContentViewClient;
import org.chromium.content.browser.ContentViewCore;
-import org.chromium.content.browser.WebContentsObserver;
import org.chromium.content_public.browser.InvalidateTypes;
import org.chromium.content_public.browser.LoadUrlParams;
import org.chromium.content_public.browser.WebContents;
+import org.chromium.content_public.browser.WebContentsObserver;
import org.chromium.content_public.common.Referrer;
import org.chromium.content_public.common.TopControlsState;
import org.chromium.printing.PrintManagerDelegateImpl;
@@ -1874,11 +1874,14 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
mWebContentsDelegate = null;
if (mWebContentsObserver != null) {
- mWebContentsObserver.detachFromWebContents();
+ mWebContentsObserver.destroy();
mWebContentsObserver = null;
}
- mVoiceSearchTabHelper = null;
+ if (mVoiceSearchTabHelper != null) {
+ mVoiceSearchTabHelper.destroy();
+ mVoiceSearchTabHelper = null;
+ }
assert mNativeTabAndroid != 0;
nativeDestroyWebContents(mNativeTabAndroid, deleteNativeWebContents);

Powered by Google App Engine
This is Rietveld 408576698