Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2467)

Unified Diff: chrome/android/testshell/java/src/org/chromium/chrome/shell/ChromiumTestShellApplication.java

Issue 184993005: Rename ChromiumTestShell classes to ChromeShell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase yet again Created 6 years, 10 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
Index: chrome/android/testshell/java/src/org/chromium/chrome/shell/ChromiumTestShellApplication.java
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/shell/ChromiumTestShellApplication.java b/chrome/android/testshell/java/src/org/chromium/chrome/shell/ChromiumTestShellApplication.java
deleted file mode 100644
index d9aad3fbf543aa8f3fd834459b3d8e037ba7dba1..0000000000000000000000000000000000000000
--- a/chrome/android/testshell/java/src/org/chromium/chrome/shell/ChromiumTestShellApplication.java
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.shell;
-
-import android.content.Intent;
-
-import org.chromium.base.CommandLine;
-import org.chromium.base.PathUtils;
-import org.chromium.chrome.browser.ChromiumApplication;
-import org.chromium.chrome.browser.PKCS11AuthenticationManager;
-import org.chromium.chrome.browser.UmaUtils;
-import org.chromium.chrome.browser.invalidation.UniqueIdInvalidationClientNameGenerator;
-import org.chromium.content.browser.ResourceExtractor;
-
-import java.util.ArrayList;
-
-/**
- * A basic test shell {@link android.app.Application}. Handles setting up the native library and
- * loading the right resources.
- */
-public class ChromiumTestShellApplication extends ChromiumApplication {
- private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "chromiumtestshell";
- private static final String[] CHROME_MANDATORY_PAKS = {
- "en-US.pak",
- "resources.pak",
- "chrome_100_percent.pak",
- };
- private static final String COMMAND_LINE_FILE =
- "/data/local/tmp/chromium-testshell-command-line";
-
- ArrayList<ChromiumTestShellApplicationObserver> mObservers;
-
- @Override
- public void onCreate() {
- // We want to do this at the earliest possible point in startup.
- UmaUtils.recordMainEntryPointTime();
- super.onCreate();
-
- ResourceExtractor.setMandatoryPaksToExtract(CHROME_MANDATORY_PAKS);
- PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX);
-
- mObservers = new ArrayList<ChromiumTestShellApplicationObserver>();
-
- // Initialize the invalidations ID, just like we would in the downstream code.
- UniqueIdInvalidationClientNameGenerator.doInitializeAndInstallGenerator(this);
- }
-
- @Override
- public void sendBroadcast(Intent intent) {
- boolean shouldFire = true;
- for (ChromiumTestShellApplicationObserver observer : mObservers) {
- shouldFire &= observer.onSendBroadcast(intent);
- }
-
- if (shouldFire) {
- super.sendBroadcast(intent);
- }
- }
-
- public void addObserver(ChromiumTestShellApplicationObserver observer) {
- mObservers.add(observer);
- }
-
- public void removeObserver(ChromiumTestShellApplicationObserver observer) {
- mObservers.remove(observer);
- }
-
- public static void initCommandLine() {
- if (!CommandLine.isInitialized())
- CommandLine.initFromFile(COMMAND_LINE_FILE);
- }
-
- @Override
- protected void openProtectedContentSettings() {
- }
-
- @Override
- protected void showSyncSettings() {
- }
-
- @Override
- protected void showTermsOfServiceDialog() {
- }
-
- @Override
- protected boolean areParentalControlsEnabled() {
- return false;
- }
-
- @Override
- protected PKCS11AuthenticationManager getPKCS11AuthenticationManager() {
- return new TestShellPKCS11AuthenticationManager();
- }
-}

Powered by Google App Engine
This is Rietveld 408576698