content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java - Issue 131553003: Move Android TraceEvent interface to base

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/ContentViewCore.java

Issue 131553003: Move Android TraceEvent interface to base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Put back content version of TraceEvent*.java as wrappers to ease cross repository commit Created 6 years, 11 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

« base/base.gyp ('K') | « content/public/android/java/src/org/chromium/content/browser/ContentView.java ('k') | content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.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/ContentViewCore.java

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

index 30a5d3eac45087bc0adba8df73c82720af7da65d..5bd4ed79fe778231d725e699352fe3364bdfc25d 100644

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

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

@@ -55,6 +55,7 @@ import com.google.common.annotations.VisibleForTesting;

import org.chromium.base.CalledByNative;

import org.chromium.base.CommandLine;

import org.chromium.base.JNINamespace;

+import org.chromium.base.TraceEvent;

import org.chromium.base.WeakContext;

import org.chromium.content.R;

import org.chromium.content.browser.ContentViewGestureHandler.MotionEventDelegate;

@@ -70,7 +71,6 @@ import org.chromium.content.browser.input.SelectPopupDialog;

import org.chromium.content.browser.input.SelectPopupItem;

import org.chromium.content.browser.input.SelectionHandleController;

import org.chromium.content.common.ContentSwitches;

-import org.chromium.content.common.TraceEvent;

import org.chromium.ui.base.ViewAndroid;

import org.chromium.ui.base.ViewAndroidDelegate;

import org.chromium.ui.base.WindowAndroid;