summaryrefslogtreecommitdiffstats
path: root/chrome/browser/signin
diff options
context:
space:
mode:
authorbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-20 20:39:10 +0000
committerbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-20 20:39:10 +0000
commit8c3ce8d82d114a8f1f18be61ff6494faa6d29507 (patch)
tree5a3cfbc0c57a0069f30e9f77d4266c2284ed997a /chrome/browser/signin
parente5bcc76bb050fa903fe93c50e3534fb2d7a6a65f (diff)
downloadchromium_src-8c3ce8d82d114a8f1f18be61ff6494faa6d29507.zip
chromium_src-8c3ce8d82d114a8f1f18be61ff6494faa6d29507.tar.gz
chromium_src-8c3ce8d82d114a8f1f18be61ff6494faa6d29507.tar.bz2
Android: moves chrome/ to use long for JNI
BUG=317523 Review URL: https://codereview.chromium.org/67573003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236278 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/signin')
-rw-r--r--chrome/browser/signin/android_profile_oauth2_token_service.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/signin/android_profile_oauth2_token_service.cc b/chrome/browser/signin/android_profile_oauth2_token_service.cc
index 60d378d..ae44714 100644
--- a/chrome/browser/signin/android_profile_oauth2_token_service.cc
+++ b/chrome/browser/signin/android_profile_oauth2_token_service.cc
@@ -53,7 +53,7 @@ typedef base::Callback<void(
AndroidProfileOAuth2TokenService::AndroidProfileOAuth2TokenService() {
JNIEnv* env = AttachCurrentThread();
base::android::ScopedJavaLocalRef<jobject> local_java_ref =
- Java_OAuth2TokenService_create(env, reinterpret_cast<int>(this));
+ Java_OAuth2TokenService_create(env, reinterpret_cast<intptr_t>(this));
java_ref_.Reset(env, local_java_ref.obj());
}
@@ -129,7 +129,7 @@ void AndroidProfileOAuth2TokenService::FetchOAuth2Token(
env, base::android::GetApplicationContext(),
j_username.obj(),
j_scope.obj(),
- reinterpret_cast<int>(heap_callback.release()));
+ reinterpret_cast<intptr_t>(heap_callback.release()));
}
void AndroidProfileOAuth2TokenService::InvalidateOAuth2Token(
@@ -235,7 +235,7 @@ void AndroidProfileOAuth2TokenService::FireRefreshTokensLoaded() {
void OAuth2TokenFetched(JNIEnv* env, jclass clazz,
jstring authToken,
jboolean result,
- jint nativeCallback) {
+ jlong nativeCallback) {
std::string token = ConvertJavaStringToUTF8(env, authToken);
scoped_ptr<FetchOAuth2TokenCallback> heap_callback(
reinterpret_cast<FetchOAuth2TokenCallback*>(nativeCallback));