content/public/android/java/org/chromium/content/common/TraceEvent.java - Issue 10532155: Upstream some more content/ DEPS-related cleanup.

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/org/chromium/content/common/TraceEvent.java

Issue 10532155: Upstream some more content/ DEPS-related cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 6 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/common/android/command_line.cc ('K') | « content/public/android/java/org/chromium/content/common/CommandLine.java ('k') | content/public/browser/android/bitmap_holder.h » ('j') | content/public/browser/android/bitmap_holder.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/java/org/chromium/content/common/TraceEvent.java

diff --git a/content/public/android/java/org/chromium/content/browser/TraceEvent.java b/content/public/android/java/org/chromium/content/common/TraceEvent.java

similarity index 97%

rename from content/public/android/java/org/chromium/content/browser/TraceEvent.java

rename to content/public/android/java/org/chromium/content/common/TraceEvent.java

index b1ad95f0a472eae8e8e527914a8fe7d29816438e..458db8bfb1be63edb402c1f641be065f304d9903 100644

--- a/content/public/android/java/org/chromium/content/browser/TraceEvent.java

+++ b/content/public/android/java/org/chromium/content/common/TraceEvent.java

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-package org.chromium.content.browser;

+package org.chromium.content.common;

import android.os.Looper;

import android.util.Printer;

@@ -44,9 +44,6 @@ public class TraceEvent {

* The native library must be loaded before the first call with enabled == true.

public static synchronized void setEnabled(boolean enabled) {

- if (enabled) {

- LibraryLoader.checkIsReady();

Yaron 2012/06/15 17:40:35 This was extraneous?

no sievers 2012/06/15 20:34:41 yes, also removed downstream. Since this is gettin

- }

if (sEnabled == enabled) {

return;

}