content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java - Issue 2316183002: Remove @MainDex from classes within content/browser

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 2316183002: Remove @MainDex from classes within content/browser (Closed)

Patch Set: Back to PS3 Created 4 years, 3 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

« content/public/android/java/src/org/chromium/content/browser/FileDescriptorInfo.java ('K') | « content/public/android/java/src/org/chromium/content/browser/FileDescriptorInfo.java ('k') | content/public/android/java/src/org/chromium/content/common/FileDescriptorInfo.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 6919298023a235f4026406e2109740bd3a298c82..2e9157f818f42ef22fed0d099d03b0ece189a916 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

@@ -10,7 +10,6 @@ import org.chromium.base.ThreadUtils;

import org.chromium.base.VisibleForTesting;

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;

import org.chromium.content_public.common.MediaMetadata;

@@ -19,7 +18,6 @@ import org.chromium.content_public.common.MediaMetadata;

* 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;