content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java - Issue 12091033: Relanding "Add apk for running content_browsertests"

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 12091033: Relanding "Add apk for running content_browsertests" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 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

« no previous file with comments | « content/shell/android/shell_apk/res/layout/content_shell_activity.xml ('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/java/src/org/chromium/content_shell/ContentShellActivity.java b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

similarity index 97%

rename from content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java

rename to content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

index cd3e546e35c5da3122ba26f3338fd8b96b881529..0ce99d846eda50bd36724d435ee6b7f30cba2bab 100644

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

+++ b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.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_shell;

+package org.chromium.content_shell_apk;

import android.app.Activity;

import android.content.BroadcastReceiver;

@@ -23,6 +23,8 @@ import org.chromium.content.browser.DeviceUtils;

import org.chromium.content.browser.TracingIntentHandler;

import org.chromium.content.common.CommandLine;

import org.chromium.content.common.ProcessInitException;

+import org.chromium.content_shell.Shell;

+import org.chromium.content_shell.ShellManager;

import org.chromium.ui.gfx.ActivityNativeWindow;

/**

@@ -38,7 +40,6 @@ public class ContentShellActivity extends ChromiumActivity {

"org.chromium.content_shell.action.PROFILE_START";

private static final String ACTION_STOP_TRACE =

"org.chromium.content_shell.action.PROFILE_STOP";

- public static final String DEFAULT_SHELL_URL = "http://www.google.com";

public static final String COMMAND_LINE_ARGS_KEY = "commandLineArgs";

private ShellManager mShellManager;

@@ -76,7 +77,7 @@ public class ContentShellActivity extends ChromiumActivity {

mShellManager.setStartupUrl(Shell.sanitizeUrl(startupUrl));

}

if (!ContentView.enableMultiProcess(this, ContentView.MAX_RENDERERS_AUTOMATIC)) {

- String shellUrl = DEFAULT_SHELL_URL;

+ String shellUrl = ShellManager.DEFAULT_SHELL_URL;

if (savedInstanceState != null

&& savedInstanceState.containsKey(ACTIVE_SHELL_URL_KEY)) {

shellUrl = savedInstanceState.getString(ACTIVE_SHELL_URL_KEY);