chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java - Issue 845543005: Rename SyncStatusHelper to AndroidSyncSettings.

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/ChromeBrowserProvider.java

Issue 845543005: Rename SyncStatusHelper to AndroidSyncSettings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gsm

Patch Set: Fix DEPS. Created 5 years, 11 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/java/DEPS ('k') | chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.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/ChromeBrowserProvider.java

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

index 59fd08d6490d2c242e1db726882c15b009f2d9fb..860c2abd438207905d7dc1a3bfb875dd8d1e001c 100644

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

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

@@ -35,7 +35,7 @@ import org.chromium.base.ThreadUtils;

import org.chromium.base.VisibleForTesting;

import org.chromium.base.annotations.SuppressFBWarnings;

import org.chromium.chrome.browser.database.SQLiteCursor;

-import org.chromium.sync.notifier.SyncStatusHelper;

+import org.chromium.sync.AndroidSyncSettings;

import java.util.ArrayList;

import java.util.Arrays;

@@ -630,7 +630,7 @@ public class ChromeBrowserProvider extends ContentProvider {

// Don't allow going up the hierarchy if sync is disabled and the requested node

// is the Mobile Bookmarks folder.

if (getParent && nodeId == getMobileBookmarksFolderId()

- && !SyncStatusHelper.get(getContext()).isSyncEnabled()) {

+ && !AndroidSyncSettings.get(getContext()).isSyncEnabled()) {

getParent = false;

}