| Index: chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java
|
| index a92395e560fcd1531a59969a337d69e1be72c1f3..5d39f793006fb55d8fc584690bdd7a17f5ad5b0e 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java
|
| @@ -25,10 +25,10 @@ import org.chromium.base.TraceEvent;
|
| import org.chromium.base.library_loader.LoaderErrors;
|
| import org.chromium.base.library_loader.ProcessInitException;
|
| import org.chromium.chrome.browser.ChromeApplication;
|
| -import org.chromium.chrome.browser.WarmupManager;
|
| -import org.chromium.chrome.browser.metrics.LaunchHistogram;
|
| -import org.chromium.chrome.browser.metrics.MemoryUma;
|
| -import org.chromium.chrome.browser.profiles.Profile;
|
| +//import org.chromium.chrome.browser.WarmupManager;
|
| +//import org.chromium.chrome.browser.metrics.LaunchHistogram;
|
| +//import org.chromium.chrome.browser.metrics.MemoryUma;
|
| +//import org.chromium.chrome.browser.profiles.Profile;
|
| import org.chromium.ui.base.DeviceFormFactor;
|
|
|
| import java.lang.reflect.Field;
|
| @@ -39,8 +39,8 @@ import java.lang.reflect.Field;
|
| public abstract class AsyncInitializationActivity extends AppCompatActivity implements
|
| ChromeActivityNativeDelegate, BrowserParts {
|
|
|
| - private static final LaunchHistogram sBadIntentMetric =
|
| - new LaunchHistogram("Launch.InvalidIntent");
|
| +// private static final LaunchHistogram sBadIntentMetric =
|
| +// new LaunchHistogram("Launch.InvalidIntent");
|
|
|
| protected final Handler mHandler;
|
|
|
| @@ -53,7 +53,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl
|
| private int mCurrentOrientation = Surface.ROTATION_0;
|
| private boolean mDestroyed;
|
| private NativeInitializationController mNativeInitializationController;
|
| - private MemoryUma mMemoryUma;
|
| + //private MemoryUma mMemoryUma;
|
| private boolean mIsTablet;
|
| private long mLastUserInteractionTime;
|
|
|
| @@ -94,12 +94,12 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl
|
| @Override
|
| public void maybePreconnect() {
|
| TraceEvent.begin("maybePreconnect");
|
| - Intent intent = getIntent();
|
| - if (intent != null && Intent.ACTION_VIEW.equals(intent.getAction())) {
|
| - final String url = intent.getDataString();
|
| - WarmupManager.getInstance()
|
| - .maybePreconnectUrlAndSubResources(Profile.getLastUsedProfile(), url);
|
| - }
|
| +// Intent intent = getIntent();
|
| +// if (intent != null && Intent.ACTION_VIEW.equals(intent.getAction())) {
|
| +// final String url = intent.getDataString();
|
| +// WarmupManager.getInstance()
|
| +// .maybePreconnectUrlAndSubResources(Profile.getLastUsedProfile(), url);
|
| +// }
|
| TraceEvent.end("maybePreconnect");
|
| }
|
|
|
| @@ -121,7 +121,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl
|
| checkOrientation();
|
| }
|
| });
|
| - mMemoryUma = new MemoryUma();
|
| + //mMemoryUma = new MemoryUma();
|
| mNativeInitializationController.onNativeInitializationComplete();
|
| }
|
|
|
| @@ -148,7 +148,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl
|
| @Override
|
| protected final void onCreate(Bundle savedInstanceState) {
|
| if (!isStartedUpCorrectly(getIntent())) {
|
| - sBadIntentMetric.recordHit();
|
| + //sBadIntentMetric.recordHit();
|
| super.onCreate(null);
|
| ApiCompatibilityUtils.finishAndRemoveTask(this);
|
| return;
|
| @@ -220,7 +220,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl
|
| @Override
|
| public void onStop() {
|
| super.onStop();
|
| - if (mMemoryUma != null) mMemoryUma.onStop();
|
| + //if (mMemoryUma != null) mMemoryUma.onStop();
|
| mNativeInitializationController.onStop();
|
| }
|
|
|
| @@ -245,7 +245,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl
|
|
|
| @Override
|
| public void onResumeWithNative() {
|
| - sBadIntentMetric.commitHistogram();
|
| + //sBadIntentMetric.commitHistogram();
|
| }
|
|
|
| @Override
|
| @@ -285,13 +285,13 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl
|
| @Override
|
| public void onLowMemory() {
|
| super.onLowMemory();
|
| - if (mMemoryUma != null) mMemoryUma.onLowMemory();
|
| + //if (mMemoryUma != null) mMemoryUma.onLowMemory();
|
| }
|
|
|
| @Override
|
| public void onTrimMemory(int level) {
|
| super.onTrimMemory(level);
|
| - if (mMemoryUma != null) mMemoryUma.onTrimMemory(level);
|
| + //if (mMemoryUma != null) mMemoryUma.onTrimMemory(level);
|
| }
|
|
|
| /**
|
|
|