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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.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/preferences/MainPreferences.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
index 8d0679a67fa97d67371162c07ff04b9de1d61ecf..1b6bfc37e9fb7812ca7211cd07a01cbdd03b8f33 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
@@ -12,17 +12,14 @@ import android.preference.Preference;
import android.preference.PreferenceFragment;
import org.chromium.base.VisibleForTesting;
-import org.chromium.blimp_public.BlimpClientContext;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ChromeFeatureList;
import org.chromium.chrome.browser.PasswordUIView;
import org.chromium.chrome.browser.autofill.PersonalDataManager;
-import org.chromium.chrome.browser.blimp.BlimpClientContextFactory;
import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
import org.chromium.chrome.browser.preferences.datareduction.DataReductionPreferences;
import org.chromium.chrome.browser.preferences.password.SavePasswordsPreferences;
-import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.search_engines.TemplateUrlService;
import org.chromium.chrome.browser.search_engines.TemplateUrlService.LoadListener;
import org.chromium.chrome.browser.signin.SigninManager;
@@ -100,8 +97,6 @@ public class MainPreferences extends PreferenceFragment
if (getPreferenceScreen() != null) getPreferenceScreen().removeAll();
addPreferencesFromResource(R.xml.main_preferences);
- addBlimpPreferences();
-
if (TemplateUrlService.getInstance().isLoaded()) {
updateSummary();
} else {
@@ -248,10 +243,4 @@ public class MainPreferences extends PreferenceFragment
}
};
}
-
- private void addBlimpPreferences() {
- BlimpClientContext blimpClientContext = BlimpClientContextFactory
- .getBlimpClientContextForProfile(Profile.getLastUsedProfile().getOriginalProfile());
- blimpClientContext.attachBlimpPreferences(this);
- }
}

Powered by Google App Engine
This is Rietveld 408576698