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

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

Issue 2173563003: Blimp settings UI integration for Chrome, everything still lives in Blimp. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nit issues, and prepare to commit. 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/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 4e818500012fee1e1e5f8f608e09fcc79644a4b3..c9820b620f3fd186d2e3dfc69456e5502f807c96 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,14 +12,18 @@ 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.blimp.BlimpSettingsCallbacksImpl;
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.signin.SigninManager;
import org.chromium.chrome.browser.signin.SigninManager.SignInStateObserver;
import org.chromium.chrome.browser.sync.ProfileSyncService;
@@ -104,6 +108,8 @@ public class MainPreferences extends PreferenceFragment implements SignInStateOb
if (getPreferenceScreen() != null) getPreferenceScreen().removeAll();
addPreferencesFromResource(R.xml.main_preferences);
+ addBlimpPreferences();
+
ChromeBasePreference autofillPref =
(ChromeBasePreference) findPreference(PREF_AUTOFILL_SETTINGS);
setOnOffSummary(autofillPref, PersonalDataManager.isAutofillEnabled());
@@ -228,4 +234,10 @@ public class MainPreferences extends PreferenceFragment implements SignInStateOb
}
};
}
+
+ private void addBlimpPreferences() {
+ BlimpClientContext blimpClientContext = BlimpClientContextFactory
+ .getBlimpClientContextForProfile(Profile.getLastUsedProfile().getOriginalProfile());
+ blimpClientContext.attachBlimpPreferences(this, new BlimpSettingsCallbacksImpl());
+ }
}

Powered by Google App Engine
This is Rietveld 408576698