content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java - Issue 1408163009: [Android] Enable multidex for debug builds of ChromePublic.

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/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java

Issue 1408163009: [Android] Enable multidex for debug builds of ChromePublic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: actually remove --tested-apk-multidex-configuration-path Created 5 years, 1 month 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

« base/base.gyp ('K') | « content/public/android/java/src/org/chromium/content/browser/LocationProviderAdapter.java ('k') | mojo/android/system/src/org/chromium/mojo/system/impl/CoreImpl.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java

diff --git a/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java b/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java

index a225dc8232683e3f31c2ddbe9c08908b9b2b8e45..1c364305199fc12b50dc61a0472873937ff869df 100644

--- a/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java

+++ b/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java

@@ -9,6 +9,7 @@ import org.chromium.base.ObserverList.RewindableIterator;

import org.chromium.base.ThreadUtils;

import org.chromium.base.annotations.CalledByNative;

import org.chromium.base.annotations.JNINamespace;

+import org.chromium.base.annotations.MainDex;

import org.chromium.content_public.browser.WebContentsObserver;

/**

@@ -16,6 +17,7 @@ import org.chromium.content_public.browser.WebContentsObserver;

* avoiding redundant JNI-related work when there are multiple Java-based observers.

@JNINamespace("content")

+@MainDex

class WebContentsObserverProxy extends WebContentsObserver {

private long mNativeWebContentsObserverProxy;

private final ObserverList<WebContentsObserver> mObservers;