Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(570)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java

Issue 1414203016: [Sync] Introduce GmsCoreSyncListener. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tests. Created 5 years, 1 month 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/sync/ProfileSyncService.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java
index 31f6d5b3d13cc2b61511229654df2ce3a3340257..3daecc50e2711765c9d26b1c63af40812e55f285 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java
@@ -195,6 +195,11 @@ public class ProfileSyncService {
return nativeIsUsingSecondaryPassphrase(mNativeProfileSyncServiceAndroid);
}
+ public byte[] getCustomPassphraseKey() {
+ assert isUsingSecondaryPassphrase();
+ return nativeGetCustomPassphraseKey(mNativeProfileSyncServiceAndroid);
+ }
+
/**
* Checks if we need a passphrase to decrypt a currently-enabled data type. This returns false
* if a passphrase is needed for a type that is not currently enabled.
@@ -496,6 +501,7 @@ public class ProfileSyncService {
private native boolean nativeIsPassphraseRequiredForDecryption(
long nativeProfileSyncServiceAndroid);
private native boolean nativeIsUsingSecondaryPassphrase(long nativeProfileSyncServiceAndroid);
+ private native byte[] nativeGetCustomPassphraseKey(long nativeProfileSyncServiceAndroid);
private native boolean nativeSetDecryptionPassphrase(
long nativeProfileSyncServiceAndroid, String passphrase);
private native void nativeSetEncryptionPassphrase(

Powered by Google App Engine
This is Rietveld 408576698