chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.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/ChromeApplication.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

Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java

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

index 1715d7edf372be9a7ec31bf1a59fd1d459ab6d4f..75a9775cd14bb5fbfc417f0f9046a4423691ce55 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java

@@ -91,6 +91,9 @@ import org.chromium.chrome.browser.tabmodel.document.StorageDelegate;

import org.chromium.chrome.browser.tabmodel.document.TabDelegate;

import org.chromium.chrome.browser.util.FeatureUtilities;

import org.chromium.chrome.browser.webapps.WebApkBuilder;

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

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

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

import org.chromium.content.app.ContentApplication;

import org.chromium.content.browser.ChildProcessCreationParams;

import org.chromium.content.browser.ChildProcessLauncher;

@@ -100,9 +103,6 @@ import org.chromium.policy.AppRestrictionsProvider;

import org.chromium.policy.CombinedPolicyProvider;

import org.chromium.policy.CombinedPolicyProvider.PolicyChangeListener;

import org.chromium.printing.PrintingController;

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

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

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

import org.chromium.ui.UiUtils;

import org.chromium.ui.base.ActivityWindowAndroid;

import org.chromium.ui.base.ResourceBundle;

« build/all.gyp ('K') | « chrome/android/java/DEPS ('k') | chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupAgent.java » ('j') | no next file with comments »