chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java - Issue 2148293004: [Sync] //components/sync external changes [DO NOT SUBMIT]

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2148293004: [Sync] //components/sync external changes [DO NOT SUBMIT] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sc-1

Patch Set: Rebase. 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

« build/all.gyp ('K') | « chrome/android/java/src/org/chromium/chrome/browser/precache/PrecacheController.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/preferences/SignInPreference.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..0c632eb3b4ce95925ac00e7c30f688351ec35c76 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

@@ -23,7 +23,7 @@ import org.chromium.chrome.browser.preferences.password.SavePasswordsPreferences

import org.chromium.chrome.browser.signin.SigninManager;

import org.chromium.chrome.browser.signin.SigninManager.SignInStateObserver;

import org.chromium.chrome.browser.sync.ProfileSyncService;

-import org.chromium.sync.AndroidSyncSettings;

+import org.chromium.components.sync.AndroidSyncSettings;

/**

* The main settings screen, shown when the user first opens Settings.