Chromium Code Reviews| 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..d2270fae322da1133d3fe8d6e528abf4f03eb688 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; |
| @@ -232,6 +234,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity |
| // See enableHardwareAcceleration() |
| private boolean mSetWindowHWA; |
| + // Chrome delegate that includes functionalities needed by Blimp client. |
| + private ChromeBlimpClientContextDelegate mBlimpClientContextDelegate; |
| + |
| /** |
| * @param The {@link AppMenuHandlerFactory} for creating {@link mAppMenuHandler} |
| */ |
| @@ -854,6 +859,10 @@ public abstract class ChromeActivity extends AsyncInitializationActivity |
| manager.removeTouchExplorationStateChangeListener(mTouchExplorationStateChangeListener); |
| } |
| + if (mBlimpClientContextDelegate != null) { |
| + mBlimpClientContextDelegate.destroy(); |
|
David Trainor- moved to gerrit
2016/08/03 19:39:54
mBlimpClientContextDelegate = null; after?
xingliu
2016/08/03 22:02:39
Done.
|
| + } |
| + |
| super.onDestroy(); |
| } |
| @@ -921,6 +930,10 @@ public abstract class ChromeActivity extends AsyncInitializationActivity |
| } |
| DownloadManagerService.getDownloadManagerService( |
| getApplicationContext()).onActivityLaunched(); |
| + |
| + mBlimpClientContextDelegate = ChromeBlimpClientContextDelegate |
| + .createAndSetDelegateForContext(Profile.getLastUsedProfile().getOriginalProfile()); |
| + |
| super.finishNativeInitialization(); |
| } |