Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(237)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

Issue 2233023002: Adding BlimpNavigationController to Tab (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nav_handler_remove
Patch Set: Fixing unit tests Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 cd02595d8c2e8f70ba16068de3a6ef2c6eb40616..11e1ef39e8f1af5b542612ee2bb63d26d2d4b97a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
@@ -469,6 +469,10 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
@Override
public void initializeState() {
super.initializeState();
+ mBlimpClientContextDelegate =
+ ChromeBlimpClientContextDelegate.createAndSetDelegateForContext(
+ Profile.getLastUsedProfile().getOriginalProfile());
+
IntentHandler.setTestIntentsEnabled(
CommandLine.getInstance().hasSwitch(ContentSwitches.ENABLE_TEST_INTENTS));
mIntentHandler = new IntentHandler(createIntentHandlerDelegate(), getPackageName());
@@ -963,9 +967,6 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
DownloadManagerService.getDownloadManagerService(
getApplicationContext()).onActivityLaunched();
- mBlimpClientContextDelegate = ChromeBlimpClientContextDelegate
- .createAndSetDelegateForContext(Profile.getLastUsedProfile().getOriginalProfile());
-
super.finishNativeInitialization();
}
« no previous file with comments | « blimp/client/public/contents/blimp_contents.h ('k') | chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698