Index: chrome/android/shell_aura/java/src/org/chromium/chrome/shell/ChromeShellApplication.java |
diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java b/chrome/android/shell_aura/java/src/org/chromium/chrome/shell/ChromeShellApplication.java |
similarity index 62% |
copy from chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java |
copy to chrome/android/shell_aura/java/src/org/chromium/chrome/shell/ChromeShellApplication.java |
index 8fd5b0406b25addc0a8b51799a109a0b142ca693..b746ec3151c674142ba05e7e906cc24a53783a1f 100644 |
--- a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java |
+++ b/chrome/android/shell_aura/java/src/org/chromium/chrome/shell/ChromeShellApplication.java |
@@ -10,14 +10,14 @@ import org.chromium.base.ResourceExtractor; |
import org.chromium.base.annotations.SuppressFBWarnings; |
import org.chromium.chrome.R; |
import org.chromium.chrome.browser.ChromeApplication; |
-import org.chromium.chrome.browser.identity.UniqueIdentificationGeneratorFactory; |
-import org.chromium.chrome.browser.identity.UuidBasedUniqueIdentificationGenerator; |
-import org.chromium.chrome.browser.invalidation.UniqueIdInvalidationClientNameGenerator; |
-import org.chromium.chrome.browser.metrics.UmaUtils; |
-import org.chromium.chrome.browser.smartcard.EmptyPKCS11AuthenticationManager; |
-import org.chromium.chrome.browser.smartcard.PKCS11AuthenticationManager; |
-import org.chromium.chrome.browser.sync.SyncController; |
-import org.chromium.chrome.shell.preferences.ChromeShellPreferences; |
+//import org.chromium.chrome.browser.identity.UniqueIdentificationGeneratorFactory; |
+//import org.chromium.chrome.browser.identity.UuidBasedUniqueIdentificationGenerator; |
+//import org.chromium.chrome.browser.invalidation.UniqueIdInvalidationClientNameGenerator; |
+//import org.chromium.chrome.browser.metrics.UmaUtils; |
+//import org.chromium.chrome.browser.smartcard.EmptyPKCS11AuthenticationManager; |
+//import org.chromium.chrome.browser.smartcard.PKCS11AuthenticationManager; |
+//import org.chromium.chrome.browser.sync.SyncController; |
+//import org.chromium.chrome.shell.preferences.ChromeShellPreferences; |
import org.chromium.ui.base.ResourceBundle; |
/** |
@@ -34,20 +34,20 @@ public class ChromeShellApplication extends ChromeApplication { |
@Override |
public void onCreate() { |
// We want to do this at the earliest possible point in startup. |
- UmaUtils.recordMainEntryPointTime(); |
+// UmaUtils.recordMainEntryPointTime(); |
super.onCreate(); |
// Assume that application start always leads to meaningful UMA startup metrics. This is not |
// the case for the official Chrome on Android. |
- UmaUtils.setRunningApplicationStart(true); |
+// UmaUtils.setRunningApplicationStart(true); |
// Initialize the invalidations ID, just like we would in the downstream code. |
- UniqueIdInvalidationClientNameGenerator.doInitializeAndInstallGenerator(this); |
+// UniqueIdInvalidationClientNameGenerator.doInitializeAndInstallGenerator(this); |
// Set up the identification generator for sync. The ID is actually generated |
// in the SyncController constructor. |
- UniqueIdentificationGeneratorFactory.registerGenerator(SyncController.GENERATOR_ID, |
- new UuidBasedUniqueIdentificationGenerator(this, SESSIONS_UUID_PREF_KEY), false); |
+// UniqueIdentificationGeneratorFactory.registerGenerator(SyncController.GENERATOR_ID, |
+// new UuidBasedUniqueIdentificationGenerator(this, SESSIONS_UUID_PREF_KEY), false); |
} |
@Override |
@@ -65,18 +65,18 @@ public class ChromeShellApplication extends ChromeApplication { |
} |
} |
- @Override |
- public String getSettingsActivityName() { |
- return ChromeShellPreferences.class.getName(); |
- } |
+// @Override |
+// public String getSettingsActivityName() { |
+// return ChromeShellPreferences.class.getName(); |
+// } |
@Override |
protected boolean areParentalControlsEnabled() { |
return false; |
} |
- @Override |
- protected PKCS11AuthenticationManager getPKCS11AuthenticationManager() { |
- return EmptyPKCS11AuthenticationManager.getInstance(); |
- } |
+// @Override |
+// protected PKCS11AuthenticationManager getPKCS11AuthenticationManager() { |
+// return EmptyPKCS11AuthenticationManager.getInstance(); |
+// } |
} |