content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java - Issue 23522032: Change method of activity tracking done in ActivityStatus.

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/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

Issue 23522032: Change method of activity tracking done in ActivityStatus. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Actually remove isActive this time Created 7 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

« no previous file with comments | « content/public/android/javatests/src/org/chromium/content/browser/LocationProviderTest.java ('k') | content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

diff --git a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

index c98ba123a8fdf47f940796d462895df2125d9994..f6720b6210f0c49e8d6498882fc7f43f69920997 100644

--- a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

+++ b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

@@ -4,6 +4,7 @@

package org.chromium.content_shell_apk;

+import android.app.Activity;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;

@@ -14,7 +15,6 @@ import android.util.Log;

import android.view.KeyEvent;

import android.widget.Toast;

-import org.chromium.base.ChromiumActivity;

import org.chromium.base.MemoryPressureListener;

import org.chromium.content.app.LibraryLoader;

import org.chromium.content.browser.ActivityContentVideoViewClient;

@@ -33,7 +33,7 @@ import org.chromium.ui.WindowAndroid;

/**

* Activity for managing the Content Shell.

-public class ContentShellActivity extends ChromiumActivity {

+public class ContentShellActivity extends Activity {

public static final String COMMAND_LINE_FILE = "/data/local/tmp/content-shell-command-line";

private static final String TAG = "ContentShellActivity";