chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.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/sync/SyncController.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/sync/ProfileSyncService.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.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/sync/SyncController.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java

index 4a2d7ad2ff129cfd7ff50b53837887f2d72f3624..39ce6929e3569fd40d402e4d00d97484d26c5380 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java

@@ -21,11 +21,11 @@ import org.chromium.chrome.browser.invalidation.InvalidationController;

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

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

import org.chromium.chrome.browser.sync.ui.PassphraseActivity;

-import org.chromium.sync.AndroidSyncSettings;

-import org.chromium.sync.ModelType;

-import org.chromium.sync.PassphraseType;

-import org.chromium.sync.StopSource;

-import org.chromium.sync.signin.ChromeSigninController;

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

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

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

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

+import org.chromium.components.sync.signin.ChromeSigninController;

import javax.annotation.Nullable;