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

Unified Diff: chrome/browser/signin/oauth2_token_service_delegate_android.cc

Issue 1308363003: Revert of jni_generator: Make all object-returning natives return ScopedJavaLocalRef. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
Index: chrome/browser/signin/oauth2_token_service_delegate_android.cc
diff --git a/chrome/browser/signin/oauth2_token_service_delegate_android.cc b/chrome/browser/signin/oauth2_token_service_delegate_android.cc
index 04e78c0db5cb70e23ee1815a56fb34b9f391d263..8bd13bcd5224c6f838b5e26aedb4bc5d4474f0aa 100644
--- a/chrome/browser/signin/oauth2_token_service_delegate_android.cc
+++ b/chrome/browser/signin/oauth2_token_service_delegate_android.cc
@@ -150,7 +150,7 @@
}
// static
-ScopedJavaLocalRef<jobject> OAuth2TokenServiceDelegateAndroid::GetForProfile(
+jobject OAuth2TokenServiceDelegateAndroid::GetForProfile(
JNIEnv* env,
jclass clazz,
jobject j_profile_android) {
@@ -158,13 +158,13 @@
ProfileOAuth2TokenService* service =
ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
OAuth2TokenServiceDelegate* delegate = service->GetDelegate();
- return ScopedJavaLocalRef<jobject>(
- static_cast<OAuth2TokenServiceDelegateAndroid*>(delegate)->java_ref_);
-}
-
-static ScopedJavaLocalRef<jobject> GetForProfile(JNIEnv* env,
- jclass clazz,
- jobject j_profile_android) {
+ return static_cast<OAuth2TokenServiceDelegateAndroid*>(delegate)
+ ->java_ref_.obj();
+}
+
+static jobject GetForProfile(JNIEnv* env,
+ jclass clazz,
+ jobject j_profile_android) {
return OAuth2TokenServiceDelegateAndroid::GetForProfile(env, clazz,
j_profile_android);
}
« no previous file with comments | « chrome/browser/signin/oauth2_token_service_delegate_android.h ('k') | chrome/browser/ui/android/certificate_viewer_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698