chrome/android/java/src/org/chromium/chrome/browser/gsa/ContextReporter.java - Issue 1247853007: [Sync] Add auto-generated ModelType in Java.

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/gsa/ContextReporter.java

Issue 1247853007: [Sync] Add auto-generated ModelType in Java. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add SYNC_EXPORT and rebase. Created 5 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

« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/android/java/src/org/chromium/chrome/browser/invalidation/ChromiumSyncAdapter.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/gsa/ContextReporter.java

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

index b88fd436391d77cac759b5a8d809b665e147737d..03ac96dae65dd915c8001a1744ed5d3f7b6a60ab 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/gsa/ContextReporter.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/gsa/ContextReporter.java

@@ -19,8 +19,8 @@ import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;

import org.chromium.chrome.browser.tabmodel.TabModelObserver;

import org.chromium.chrome.browser.tabmodel.TabModelSelector;

import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabObserver;

+import org.chromium.sync.ModelType;

import org.chromium.sync.internal_api.pub.PassphraseType;

-import org.chromium.sync.internal_api.pub.base.ModelType;

import java.util.concurrent.atomic.AtomicBoolean;

@@ -221,7 +221,7 @@ public class ContextReporter {

public static void reportSyncStatus(ProfileSyncService syncService) {

if (!syncService.isSyncInitialized()) {

reportStatus(STATUS_SYNC_NOT_INITIALIZED);

- } else if (!syncService.getActiveDataTypes().contains(ModelType.TYPED_URL)) {

+ } else if (!syncService.getActiveDataTypes().contains(ModelType.TYPED_URLS)) {

reportStatus(STATUS_SYNC_NOT_SYNCING_URLS);

} else if (!syncService.getPassphraseType().equals(PassphraseType.KEYSTORE_PASSPHRASE)) {

reportStatus(STATUS_SYNC_NOT_KEYSTORE_PASSPHRASE);