| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 package org.chromium.android_webview.shell; | 5 package org.chromium.android_webview.shell; |
| 6 | 6 |
| 7 import android.app.Application; | 7 import android.app.Application; |
| 8 import android.os.Debug; | 8 import android.os.Debug; |
| 9 import android.util.Log; | 9 import android.util.Log; |
| 10 | 10 |
| 11 import org.chromium.android_webview.AwBrowserProcess; | 11 import org.chromium.android_webview.AwBrowserProcess; |
| 12 import org.chromium.base.BaseSwitches; | 12 import org.chromium.base.BaseSwitches; |
| 13 import org.chromium.base.CommandLine; | 13 import org.chromium.base.CommandLine; |
| 14 import org.chromium.base.ResourceExtractor; |
| 14 import org.chromium.base.TraceEvent; | 15 import org.chromium.base.TraceEvent; |
| 15 import org.chromium.content.browser.ResourceExtractor; | |
| 16 | 16 |
| 17 /** | 17 /** |
| 18 * The android_webview shell Application subclass. | 18 * The android_webview shell Application subclass. |
| 19 */ | 19 */ |
| 20 public class AwShellApplication extends Application { | 20 public class AwShellApplication extends Application { |
| 21 | 21 |
| 22 private static final String TAG = "AwShellApplication"; | 22 private static final String TAG = "AwShellApplication"; |
| 23 /** The minimum set of .pak files the test runner needs. */ | 23 /** The minimum set of .pak files the test runner needs. */ |
| 24 private static final String[] MANDATORY_PAKS = { "icudtl.dat" }; | 24 private static final String[] MANDATORY_PAKS = { "icudtl.dat" }; |
| 25 | 25 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 40 ResourceExtractor.setMandatoryPaksToExtract(MANDATORY_PAKS); | 40 ResourceExtractor.setMandatoryPaksToExtract(MANDATORY_PAKS); |
| 41 ResourceExtractor.setExtractImplicitLocaleForTesting(false); | 41 ResourceExtractor.setExtractImplicitLocaleForTesting(false); |
| 42 AwBrowserProcess.loadLibrary(); | 42 AwBrowserProcess.loadLibrary(); |
| 43 | 43 |
| 44 if (CommandLine.getInstance().hasSwitch(AwShellSwitches.ENABLE_ATRACE))
{ | 44 if (CommandLine.getInstance().hasSwitch(AwShellSwitches.ENABLE_ATRACE))
{ |
| 45 Log.e(TAG, "Enabling Android trace."); | 45 Log.e(TAG, "Enabling Android trace."); |
| 46 TraceEvent.setATraceEnabled(true); | 46 TraceEvent.setATraceEnabled(true); |
| 47 } | 47 } |
| 48 } | 48 } |
| 49 } | 49 } |
| OLD | NEW |