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

Unified Diff: chrome/browser/sync/profile_sync_service_android.cc

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, 9 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/browser/sync/profile_sync_service_android.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/profile_sync_service_android.cc
diff --git a/chrome/browser/sync/profile_sync_service_android.cc b/chrome/browser/sync/profile_sync_service_android.cc
index 7c32924d67ad22bc9e8ea695359489314049a294..a4af53f97cabcef17ddf48a24ae0641f0098319e 100644
--- a/chrome/browser/sync/profile_sync_service_android.cc
+++ b/chrome/browser/sync/profile_sync_service_android.cc
@@ -13,6 +13,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/prefs/pref_service.h"
#include "base/time.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/signin/signin_manager.h"
@@ -383,6 +384,18 @@ ScopedJavaLocalRef<jstring>
}
ScopedJavaLocalRef<jstring>
+ ProfileSyncServiceAndroid::GetCurrentSignedInAccountText(
+ JNIEnv* env, jobject) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ const std::string& sync_username =
+ SigninManagerFactory::GetForProfile(profile_)->GetAuthenticatedUsername();
+ return base::android::ConvertUTF16ToJavaString(env,
+ l10n_util::GetStringFUTF16(
+ IDS_SYNC_ACCOUNT_SYNCING_TO_USER,
+ ASCIIToUTF16(sync_username)));
+}
+
+ScopedJavaLocalRef<jstring>
ProfileSyncServiceAndroid::GetSyncEnterCustomPassphraseBodyText(
JNIEnv* env, jobject) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
« no previous file with comments | « chrome/browser/sync/profile_sync_service_android.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698