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

Side by Side Diff: chrome/browser/sync/profile_sync_service_android.h

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 unified diff | Download patch
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 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_ANDROID_H_ 5 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_ANDROID_H_
6 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_ANDROID_H_ 6 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <map> 9 #include <map>
10 10
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 119
120 base::android::ScopedJavaLocalRef<jstring> 120 base::android::ScopedJavaLocalRef<jstring>
121 GetSyncEnterGooglePassphraseBodyWithDateText( 121 GetSyncEnterGooglePassphraseBodyWithDateText(
122 JNIEnv* env, jobject); 122 JNIEnv* env, jobject);
123 123
124 base::android::ScopedJavaLocalRef<jstring> 124 base::android::ScopedJavaLocalRef<jstring>
125 GetSyncEnterCustomPassphraseBodyWithDateText( 125 GetSyncEnterCustomPassphraseBodyWithDateText(
126 JNIEnv* env, jobject); 126 JNIEnv* env, jobject);
127 127
128 base::android::ScopedJavaLocalRef<jstring> 128 base::android::ScopedJavaLocalRef<jstring>
129 GetCurrentSignedInAccountText(
130 JNIEnv* env, jobject);
131
132 base::android::ScopedJavaLocalRef<jstring>
129 GetSyncEnterCustomPassphraseBodyText( 133 GetSyncEnterCustomPassphraseBodyText(
130 JNIEnv* env, jobject); 134 JNIEnv* env, jobject);
131 135
132 // Returns true if sync has been migrated. 136 // Returns true if sync has been migrated.
133 jboolean IsSyncKeystoreMigrationDone(JNIEnv* env, jobject obj); 137 jboolean IsSyncKeystoreMigrationDone(JNIEnv* env, jobject obj);
134 138
135 // Enables the passed data types. 139 // Enables the passed data types.
136 // If |sync_everything| is true, then all data types are enabled and the 140 // If |sync_everything| is true, then all data types are enabled and the
137 // contents of |model_type_selection| is 141 // contents of |model_type_selection| is
138 // ignored. 142 // ignored.
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 215
212 // The invalidation API spec allows for the possibility of redundant 216 // The invalidation API spec allows for the possibility of redundant
213 // invalidations, so keep track of the max versions and drop 217 // invalidations, so keep track of the max versions and drop
214 // invalidations with old versions. 218 // invalidations with old versions.
215 std::map<syncer::ModelType, int64> max_invalidation_versions_; 219 std::map<syncer::ModelType, int64> max_invalidation_versions_;
216 220
217 DISALLOW_COPY_AND_ASSIGN(ProfileSyncServiceAndroid); 221 DISALLOW_COPY_AND_ASSIGN(ProfileSyncServiceAndroid);
218 }; 222 };
219 223
220 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_ANDROID_H_ 224 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698