| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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.chrome.shell; | 5 package org.chromium.chrome.shell; |
| 6 | 6 |
| 7 import android.content.Intent; | 7 import android.content.Intent; |
| 8 import android.util.Log; | 8 import android.util.Log; |
| 9 | 9 |
| 10 import org.chromium.base.CommandLine; | 10 import org.chromium.base.CommandLine; |
| 11 import org.chromium.base.PathUtils; | 11 import org.chromium.base.PathUtils; |
| 12 import org.chromium.base.ResourceExtractor; |
| 12 import org.chromium.chrome.browser.ChromiumApplication; | 13 import org.chromium.chrome.browser.ChromiumApplication; |
| 13 import org.chromium.chrome.browser.PKCS11AuthenticationManager; | 14 import org.chromium.chrome.browser.PKCS11AuthenticationManager; |
| 14 import org.chromium.chrome.browser.Tab; | 15 import org.chromium.chrome.browser.Tab; |
| 15 import org.chromium.chrome.browser.UmaUtils; | 16 import org.chromium.chrome.browser.UmaUtils; |
| 16 import org.chromium.chrome.browser.invalidation.UniqueIdInvalidationClientNameGe
nerator; | 17 import org.chromium.chrome.browser.invalidation.UniqueIdInvalidationClientNameGe
nerator; |
| 17 import org.chromium.content.browser.ResourceExtractor; | |
| 18 | 18 |
| 19 import java.util.ArrayList; | 19 import java.util.ArrayList; |
| 20 | 20 |
| 21 /** | 21 /** |
| 22 * A basic test shell {@link android.app.Application}. Handles setting up the n
ative library and | 22 * A basic test shell {@link android.app.Application}. Handles setting up the n
ative library and |
| 23 * loading the right resources. | 23 * loading the right resources. |
| 24 */ | 24 */ |
| 25 public class ChromeShellApplication extends ChromiumApplication { | 25 public class ChromeShellApplication extends ChromiumApplication { |
| 26 private static final String TAG = "ChromeShellApplication"; | 26 private static final String TAG = "ChromeShellApplication"; |
| 27 | 27 |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 @Override | 105 @Override |
| 106 protected boolean areParentalControlsEnabled() { | 106 protected boolean areParentalControlsEnabled() { |
| 107 return false; | 107 return false; |
| 108 } | 108 } |
| 109 | 109 |
| 110 @Override | 110 @Override |
| 111 protected PKCS11AuthenticationManager getPKCS11AuthenticationManager() { | 111 protected PKCS11AuthenticationManager getPKCS11AuthenticationManager() { |
| 112 return new ChromeShellPKCS11AuthenticationManager(); | 112 return new ChromeShellPKCS11AuthenticationManager(); |
| 113 } | 113 } |
| 114 } | 114 } |
| OLD | NEW |