content/shell/android/aura_shell_apk/src/org/chromium/aura_content_shell_apk/ContentShellApplication.java - Issue 1284343005: NOT FOR REVIEW: Aura on Android - content shell compiles

Unified Diff: content/shell/android/aura_shell_apk/src/org/chromium/aura_content_shell_apk/ContentShellApplication.java

Issue 1284343005: NOT FOR REVIEW: Aura on Android - content shell compiles Base URL: https://chromium.googlesource.com/chromium/src.git@build_ALL_patch

Patch Set: Created 5 years, 4 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/shell/android/aura_shell_apk/src/org/chromium/aura_content_shell_apk/ContentShellActivity.java ('K') | « content/shell/android/aura_shell_apk/src/org/chromium/aura_content_shell_apk/ContentShellActivity.java ('k') | content/shell/android/browsertests/src/org/chromium/content_shell/browsertests/ContentShellBrowserTestActivity.java » ('j') | ui/aura/window_tree_host_android.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/android/aura_shell_apk/src/org/chromium/aura_content_shell_apk/ContentShellApplication.java

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

similarity index 72%

copy from content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java

copy to content/shell/android/aura_shell_apk/src/org/chromium/aura_content_shell_apk/ContentShellApplication.java

index bf0bb6fbea2d5df43c46c83878447dbccc29628c..dbe36dbe4eee7d4d3c891a18beddd12df2323f17 100644

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

+++ b/content/shell/android/aura_shell_apk/src/org/chromium/aura_content_shell_apk/ContentShellApplication.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_apk;

+package org.chromium.aura_content_shell_apk;

import org.chromium.base.CommandLine;

import org.chromium.base.PathUtils;

@@ -10,13 +10,14 @@ import org.chromium.base.annotations.SuppressFBWarnings;

import org.chromium.content.app.ContentApplication;

/**

- * Entry point for the content shell application. Handles initialization of information that needs

- * to be shared across the main activity and the child services created.

+ * Entry point for the content shell Aura application. Handles initialization of information that

+ * needs to be shared across the main activity and the child services created.

public class ContentShellApplication extends ContentApplication {

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

- private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "content_shell";

+ public static final String COMMAND_LINE_FILE =

+ "/data/local/tmp/content-shell-aura-command-line";

+ private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "content_shell_aura";

@Override

public void onCreate() {