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

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

Issue 2130453004: [Sync] Move //sync to //components/sync. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.chrome.browser.preferences; 5 package org.chromium.chrome.browser.preferences;
6 6
7 import android.content.Intent; 7 import android.content.Intent;
8 import android.net.Uri; 8 import android.net.Uri;
9 import android.os.Bundle; 9 import android.os.Bundle;
10 import android.os.Handler; 10 import android.os.Handler;
11 import android.preference.Preference; 11 import android.preference.Preference;
12 import android.preference.PreferenceFragment; 12 import android.preference.PreferenceFragment;
13 13
14 import org.chromium.base.VisibleForTesting; 14 import org.chromium.base.VisibleForTesting;
15 import org.chromium.blimp_public.BlimpClientContext; 15 import org.chromium.blimp_public.BlimpClientContext;
16 import org.chromium.chrome.R; 16 import org.chromium.chrome.R;
17 import org.chromium.chrome.browser.ChromeFeatureList; 17 import org.chromium.chrome.browser.ChromeFeatureList;
18 import org.chromium.chrome.browser.PasswordUIView; 18 import org.chromium.chrome.browser.PasswordUIView;
19 import org.chromium.chrome.browser.autofill.PersonalDataManager; 19 import org.chromium.chrome.browser.autofill.PersonalDataManager;
20 import org.chromium.chrome.browser.blimp.BlimpClientContextFactory; 20 import org.chromium.chrome.browser.blimp.BlimpClientContextFactory;
21 import org.chromium.chrome.browser.blimp.BlimpSettingsCallbacksImpl; 21 import org.chromium.chrome.browser.blimp.BlimpSettingsCallbacksImpl;
22 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings; 22 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
23 import org.chromium.chrome.browser.partnercustomizations.HomepageManager; 23 import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
24 import org.chromium.chrome.browser.preferences.datareduction.DataReductionPrefer ences; 24 import org.chromium.chrome.browser.preferences.datareduction.DataReductionPrefer ences;
25 import org.chromium.chrome.browser.preferences.password.SavePasswordsPreferences ; 25 import org.chromium.chrome.browser.preferences.password.SavePasswordsPreferences ;
26 import org.chromium.chrome.browser.profiles.Profile; 26 import org.chromium.chrome.browser.profiles.Profile;
27 import org.chromium.chrome.browser.signin.SigninManager; 27 import org.chromium.chrome.browser.signin.SigninManager;
28 import org.chromium.chrome.browser.signin.SigninManager.SignInStateObserver; 28 import org.chromium.chrome.browser.signin.SigninManager.SignInStateObserver;
29 import org.chromium.chrome.browser.sync.ProfileSyncService; 29 import org.chromium.chrome.browser.sync.ProfileSyncService;
30 import org.chromium.sync.AndroidSyncSettings; 30 import org.chromium.components.sync.AndroidSyncSettings;
31 31
32 /** 32 /**
33 * The main settings screen, shown when the user first opens Settings. 33 * The main settings screen, shown when the user first opens Settings.
34 */ 34 */
35 public class MainPreferences extends PreferenceFragment implements SignInStateOb server, 35 public class MainPreferences extends PreferenceFragment implements SignInStateOb server,
36 Preference.OnPreferenceClickListener { 36 Preference.OnPreferenceClickListener {
37 37
38 public static final String PREF_SIGN_IN = "sign_in"; 38 public static final String PREF_SIGN_IN = "sign_in";
39 public static final String PREF_SEARCH_ENGINE = "search_engine"; 39 public static final String PREF_SEARCH_ENGINE = "search_engine";
40 public static final String PREF_DOCUMENT_MODE = "document_mode"; 40 public static final String PREF_DOCUMENT_MODE = "document_mode";
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 } 234 }
235 }; 235 };
236 } 236 }
237 237
238 private void addBlimpPreferences() { 238 private void addBlimpPreferences() {
239 BlimpClientContext blimpClientContext = BlimpClientContextFactory 239 BlimpClientContext blimpClientContext = BlimpClientContextFactory
240 .getBlimpClientContextForProfile(Profile.getLastUsedProfile().ge tOriginalProfile()); 240 .getBlimpClientContextForProfile(Profile.getLastUsedProfile().ge tOriginalProfile());
241 blimpClientContext.attachBlimpPreferences(this, new BlimpSettingsCallbac ksImpl()); 241 blimpClientContext.attachBlimpPreferences(this, new BlimpSettingsCallbac ksImpl());
242 } 242 }
243 } 243 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698