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

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

Issue 2191743002: Setup the delegate in Chrome, so we may put chrome java functions we need in blimp to the delegate … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resovle merge conflicts. Created 4 years, 5 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 8eb3a01f94e7daf0c7bd301b62dbd50af8927845..0c76b91ec3d3d13b3b71a024f9ace11f177a1ecf 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
@@ -54,6 +54,7 @@ import org.chromium.chrome.browser.appmenu.AppMenu;
import org.chromium.chrome.browser.appmenu.AppMenuHandler;
import org.chromium.chrome.browser.appmenu.AppMenuObserver;
import org.chromium.chrome.browser.appmenu.AppMenuPropertiesDelegate;
+import org.chromium.chrome.browser.blimp.ChromeBlimpClientContextDelegate;
import org.chromium.chrome.browser.bookmarks.BookmarkModel;
import org.chromium.chrome.browser.bookmarks.BookmarkUtils;
import org.chromium.chrome.browser.compositor.CompositorViewHolder;
@@ -94,6 +95,7 @@ import org.chromium.chrome.browser.preferences.PrefServiceBridge;
import org.chromium.chrome.browser.preferences.PreferencesLauncher;
import org.chromium.chrome.browser.printing.PrintShareActivity;
import org.chromium.chrome.browser.printing.TabPrinter;
+import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.share.ShareHelper;
import org.chromium.chrome.browser.snackbar.DataUseSnackbarController;
import org.chromium.chrome.browser.snackbar.SnackbarManager;
@@ -231,6 +233,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
// See enableHardwareAcceleration()
private boolean mSetWindowHWA;
+ private ChromeBlimpClientContextDelegate mBlimpClientContextDelegate;
/**
* @param The {@link AppMenuHandlerFactory} for creating {@link mAppMenuHandler}
@@ -721,6 +724,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
if (MultiWindowUtils.getInstance().isInMultiWindowMode(this)) {
onDeferredStartupForMultiWindowMode();
}
+
+ mBlimpClientContextDelegate = ChromeBlimpClientContextDelegate
+ .createAndSetDelegateForContext(Profile.getLastUsedProfile().getOriginalProfile());
}
/**
@@ -854,6 +860,10 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
manager.removeTouchExplorationStateChangeListener(mTouchExplorationStateChangeListener);
}
+ if (mBlimpClientContextDelegate != null) {
+ mBlimpClientContextDelegate.destroy();
+ }
+
super.onDestroy();
}

Powered by Google App Engine
This is Rietveld 408576698