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

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

Issue 12972006: Display user account name in password and passphrase activity prompt. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix indent. Created 7 years, 8 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/sync/profile_sync_service_android.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.chrome.browser.sync; 5 package org.chromium.chrome.browser.sync;
6 6
7 import android.accounts.Account; 7 import android.accounts.Account;
8 import android.content.Context; 8 import android.content.Context;
9 import android.os.AsyncTask; 9 import android.os.AsyncTask;
10 import android.util.Log; 10 import android.util.Log;
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 public String getSyncEnterGooglePassphraseBodyWithDateText() { 256 public String getSyncEnterGooglePassphraseBodyWithDateText() {
257 assert isSyncInitialized(); 257 assert isSyncInitialized();
258 return nativeGetSyncEnterGooglePassphraseBodyWithDateText(mNativeProfile SyncServiceAndroid); 258 return nativeGetSyncEnterGooglePassphraseBodyWithDateText(mNativeProfile SyncServiceAndroid);
259 } 259 }
260 260
261 public String getSyncEnterCustomPassphraseBodyWithDateText() { 261 public String getSyncEnterCustomPassphraseBodyWithDateText() {
262 assert isSyncInitialized(); 262 assert isSyncInitialized();
263 return nativeGetSyncEnterCustomPassphraseBodyWithDateText(mNativeProfile SyncServiceAndroid); 263 return nativeGetSyncEnterCustomPassphraseBodyWithDateText(mNativeProfile SyncServiceAndroid);
264 } 264 }
265 265
266 public String getCurrentSignedInAccountText() {
267 assert isSyncInitialized();
268 return nativeGetCurrentSignedInAccountText(mNativeProfileSyncServiceAndr oid);
269 }
270
266 public String getSyncEnterCustomPassphraseBodyText() { 271 public String getSyncEnterCustomPassphraseBodyText() {
267 return nativeGetSyncEnterCustomPassphraseBodyText(mNativeProfileSyncServ iceAndroid); 272 return nativeGetSyncEnterCustomPassphraseBodyText(mNativeProfileSyncServ iceAndroid);
268 } 273 }
269 274
270 /** 275 /**
271 * Checks if sync is currently set to use a custom passphrase. The sync back end must be running 276 * Checks if sync is currently set to use a custom passphrase. The sync back end must be running
272 * (isSyncInitialized() returns true) before calling this function. 277 * (isSyncInitialized() returns true) before calling this function.
273 * 278 *
274 * @return true if sync is using a custom passphrase. 279 * @return true if sync is using a custom passphrase.
275 */ 280 */
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 int nativeProfileSyncServiceAndroid, String passphrase); 515 int nativeProfileSyncServiceAndroid, String passphrase);
511 private native void nativeSetEncryptionPassphrase( 516 private native void nativeSetEncryptionPassphrase(
512 int nativeProfileSyncServiceAndroid, String passphrase, boolean isGa ia); 517 int nativeProfileSyncServiceAndroid, String passphrase, boolean isGa ia);
513 private native boolean nativeIsCryptographerReady(int nativeProfileSyncServi ceAndroid); 518 private native boolean nativeIsCryptographerReady(int nativeProfileSyncServi ceAndroid);
514 private native int nativeGetPassphraseType(int nativeProfileSyncServiceAndro id); 519 private native int nativeGetPassphraseType(int nativeProfileSyncServiceAndro id);
515 private native boolean nativeHasExplicitPassphraseTime(int nativeProfileSync ServiceAndroid); 520 private native boolean nativeHasExplicitPassphraseTime(int nativeProfileSync ServiceAndroid);
516 private native String nativeGetSyncEnterGooglePassphraseBodyWithDateText( 521 private native String nativeGetSyncEnterGooglePassphraseBodyWithDateText(
517 int nativeProfileSyncServiceAndroid); 522 int nativeProfileSyncServiceAndroid);
518 private native String nativeGetSyncEnterCustomPassphraseBodyWithDateText( 523 private native String nativeGetSyncEnterCustomPassphraseBodyWithDateText(
519 int nativeProfileSyncServiceAndroid); 524 int nativeProfileSyncServiceAndroid);
525 private native String nativeGetCurrentSignedInAccountText(int nativeProfileS yncServiceAndroid);
520 private native String nativeGetSyncEnterCustomPassphraseBodyText( 526 private native String nativeGetSyncEnterCustomPassphraseBodyText(
521 int nativeProfileSyncServiceAndroid); 527 int nativeProfileSyncServiceAndroid);
522 private native boolean nativeIsSyncKeystoreMigrationDone(int nativeProfileSy ncServiceAndroid); 528 private native boolean nativeIsSyncKeystoreMigrationDone(int nativeProfileSy ncServiceAndroid);
523 private native void nativeSetPreferredDataTypes( 529 private native void nativeSetPreferredDataTypes(
524 int nativeProfileSyncServiceAndroid, boolean syncEverything, long mo delTypeSelection); 530 int nativeProfileSyncServiceAndroid, boolean syncEverything, long mo delTypeSelection);
525 private native void nativeSetSetupInProgress( 531 private native void nativeSetSetupInProgress(
526 int nativeProfileSyncServiceAndroid, boolean inProgress); 532 int nativeProfileSyncServiceAndroid, boolean inProgress);
527 private native void nativeSetSyncSetupCompleted(int nativeProfileSyncService Android); 533 private native void nativeSetSyncSetupCompleted(int nativeProfileSyncService Android);
528 private native boolean nativeHasSyncSetupCompleted(int nativeProfileSyncServ iceAndroid); 534 private native boolean nativeHasSyncSetupCompleted(int nativeProfileSyncServ iceAndroid);
529 private native boolean nativeHasKeepEverythingSynced(int nativeProfileSyncSe rviceAndroid); 535 private native boolean nativeHasKeepEverythingSynced(int nativeProfileSyncSe rviceAndroid);
530 private native boolean nativeIsAutofillSyncEnabled(int nativeProfileSyncServ iceAndroid); 536 private native boolean nativeIsAutofillSyncEnabled(int nativeProfileSyncServ iceAndroid);
531 private native boolean nativeIsBookmarkSyncEnabled(int nativeProfileSyncServ iceAndroid); 537 private native boolean nativeIsBookmarkSyncEnabled(int nativeProfileSyncServ iceAndroid);
532 private native boolean nativeIsPasswordSyncEnabled(int nativeProfileSyncServ iceAndroid); 538 private native boolean nativeIsPasswordSyncEnabled(int nativeProfileSyncServ iceAndroid);
533 private native boolean nativeIsTypedUrlSyncEnabled(int nativeProfileSyncServ iceAndroid); 539 private native boolean nativeIsTypedUrlSyncEnabled(int nativeProfileSyncServ iceAndroid);
534 private native boolean nativeIsSessionSyncEnabled(int nativeProfileSyncServi ceAndroid); 540 private native boolean nativeIsSessionSyncEnabled(int nativeProfileSyncServi ceAndroid);
535 private native boolean nativeHasUnrecoverableError(int nativeProfileSyncServ iceAndroid); 541 private native boolean nativeHasUnrecoverableError(int nativeProfileSyncServ iceAndroid);
536 private native String nativeGetAboutInfoForTest(int nativeProfileSyncService Android); 542 private native String nativeGetAboutInfoForTest(int nativeProfileSyncService Android);
537 } 543 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/sync/profile_sync_service_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698