| 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 872eabecd8986db504be746a50eea9d7ef666f84..cb34c89409fd1e33d20b501346df01488eeb9afe 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
| @@ -55,7 +55,6 @@ 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;
|
| @@ -103,7 +102,6 @@ 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.DataReductionPromoSnackbarController;
|
| import org.chromium.chrome.browser.snackbar.DataUseSnackbarController;
|
| @@ -252,9 +250,6 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
|
| // See enableHardwareAcceleration()
|
| private boolean mSetWindowHWA;
|
|
|
| - // Chrome delegate that includes functionalities needed by Blimp client.
|
| - private ChromeBlimpClientContextDelegate mBlimpClientContextDelegate;
|
| -
|
| // Skips capturing screenshot for testing purpose.
|
| private boolean mScreenshotCaptureSkippedForTesting;
|
|
|
| @@ -628,9 +623,6 @@ 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));
|
| @@ -996,11 +988,6 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
|
| manager.removeTouchExplorationStateChangeListener(mTouchExplorationStateChangeListener);
|
| }
|
|
|
| - if (mBlimpClientContextDelegate != null) {
|
| - mBlimpClientContextDelegate.destroy();
|
| - mBlimpClientContextDelegate = null;
|
| - }
|
| -
|
| super.onDestroy();
|
| }
|
|
|
|
|