Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java |
index 22553bd67afaa904db916040230234e1cbbab4e8..0bc281de98a5d88a6ab03e035fcf8ab91186820e 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java |
@@ -451,6 +451,10 @@ public abstract class ChromeActivity extends AsyncInitializationActivity |
@Override |
public void initializeState() { |
super.initializeState(); |
+ mBlimpClientContextDelegate = |
David Trainor- moved to gerrit
2016/08/11 21:40:19
What's the rationale to moving this earlier? So i
xingliu
2016/08/11 23:26:25
I think this is fine, the connect call is in a cal
nyquist
2016/08/12 05:57:18
Also, I think this makes sense here. From BrowserP
shaktisahu
2016/08/12 22:11:49
Yes, I moved this as early as possible since the v
|
+ ChromeBlimpClientContextDelegate.createAndSetDelegateForContext( |
+ Profile.getLastUsedProfile().getOriginalProfile()); |
+ |
IntentHandler.setTestIntentsEnabled( |
CommandLine.getInstance().hasSwitch(ContentSwitches.ENABLE_TEST_INTENTS)); |
mIntentHandler = new IntentHandler(createIntentHandlerDelegate(), getPackageName()); |
@@ -945,9 +949,6 @@ public abstract class ChromeActivity extends AsyncInitializationActivity |
DownloadManagerService.getDownloadManagerService( |
getApplicationContext()).onActivityLaunched(); |
- mBlimpClientContextDelegate = ChromeBlimpClientContextDelegate |
- .createAndSetDelegateForContext(Profile.getLastUsedProfile().getOriginalProfile()); |
- |
super.finishNativeInitialization(); |
} |