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

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

Issue 2623023002: Remove //chrome as an embedder of blimp. (Closed)
Patch Set: One more rebase for good measure Created 3 years, 11 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 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();
}
« no previous file with comments | « chrome/android/java/DEPS ('k') | chrome/android/java/src/org/chromium/chrome/browser/blimp/BlimpClientContextFactory.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698