diff options
Diffstat (limited to 'chrome/browser/ui/android/infobars')
4 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android.cc b/chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android.cc index 82a9fc8..47b9695 100644 --- a/chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android.cc +++ b/chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android.cc @@ -46,7 +46,7 @@ bool AutoLoginInfoBarDelegateAndroid::AttachAccount( DCHECK(delegate.obj()); user_ = base::android::ConvertJavaStringToUTF8( Java_AutoLoginDelegate_initializeAccount( - env, delegate.obj(), reinterpret_cast<jint>(this), jrealm.obj(), + env, delegate.obj(), reinterpret_cast<intptr_t>(this), jrealm.obj(), jaccount.obj(), jargs.obj())); return !user_.empty(); } @@ -63,7 +63,7 @@ bool AutoLoginInfoBarDelegateAndroid::Accept() { DCHECK(delegate.obj()); Java_AutoLoginDelegate_logIn(env, delegate.obj(), - reinterpret_cast<jint>(this)); + reinterpret_cast<intptr_t>(this)); // Do not close the infobar on accept, it will be closed as part // of the log in callback. @@ -76,7 +76,7 @@ bool AutoLoginInfoBarDelegateAndroid::Cancel() { weak_java_auto_login_delegate_.get(env); DCHECK(delegate.obj()); Java_AutoLoginDelegate_cancelLogIn(env, delegate.obj(), - reinterpret_cast<jint>(this)); + reinterpret_cast<intptr_t>(this)); return true; } diff --git a/chrome/browser/ui/android/infobars/confirm_infobar.cc b/chrome/browser/ui/android/infobars/confirm_infobar.cc index a4919e5..702f990 100644 --- a/chrome/browser/ui/android/infobars/confirm_infobar.cc +++ b/chrome/browser/ui/android/infobars/confirm_infobar.cc @@ -48,7 +48,7 @@ base::android::ScopedJavaLocalRef<jobject> ConfirmInfoBar::CreateRenderInfoBar( env, delegate_->GetLinkText()); return Java_ConfirmInfoBarDelegate_showConfirmInfoBar( - env, java_confirm_delegate_.obj(), reinterpret_cast<jint>(this), + env, java_confirm_delegate_.obj(), reinterpret_cast<intptr_t>(this), GetEnumeratedIconId(), message_text.obj(), link_text.obj(), ok_button_text.obj(), cancel_button_text.obj()); } diff --git a/chrome/browser/ui/android/infobars/infobar_container_android.cc b/chrome/browser/ui/android/infobars/infobar_container_android.cc index 42592b9..be77ac8 100644 --- a/chrome/browser/ui/android/infobars/infobar_container_android.cc +++ b/chrome/browser/ui/android/infobars/infobar_container_android.cc @@ -87,15 +87,15 @@ void InfoBarContainerAndroid::PlatformSpecificRemoveInfoBar(InfoBar* infobar) { // Native JNI methods --------------------------------------------------------- -static int Init(JNIEnv* env, - jobject obj, - jint native_web_contents, - jobject auto_login_delegate) { +static jlong Init(JNIEnv* env, + jobject obj, + jlong native_web_contents, + jobject auto_login_delegate) { InfoBarContainerAndroid* infobar_container = new InfoBarContainerAndroid(env, obj, auto_login_delegate); infobar_container->ChangeInfoBarService(InfoBarService::FromWebContents( reinterpret_cast<content::WebContents*>(native_web_contents))); - return reinterpret_cast<int>(infobar_container); + return reinterpret_cast<intptr_t>(infobar_container); } bool RegisterInfoBarContainer(JNIEnv* env) { diff --git a/chrome/browser/ui/android/infobars/translate_infobar.cc b/chrome/browser/ui/android/infobars/translate_infobar.cc index a14da81..868cd3d 100644 --- a/chrome/browser/ui/android/infobars/translate_infobar.cc +++ b/chrome/browser/ui/android/infobars/translate_infobar.cc @@ -44,7 +44,7 @@ ScopedJavaLocalRef<jobject> TranslateInfoBar::CreateRenderInfoBar(JNIEnv* env) { return Java_TranslateInfoBarDelegate_showTranslateInfoBar( env, java_translate_delegate_.obj(), - reinterpret_cast<jint>(this), + reinterpret_cast<intptr_t>(this), delegate_->infobar_type(), delegate_->original_language_index(), delegate_->target_language_index(), @@ -109,7 +109,7 @@ void TranslateInfoBar::TransferOwnership( JNIEnv* env = base::android::AttachCurrentThread(); if (Java_TranslateInfoBarDelegate_changeTranslateInfoBarTypeAndPointer( env, java_translate_delegate_.obj(), - reinterpret_cast<jint>(destination), new_type)) { + reinterpret_cast<intptr_t>(destination), new_type)) { ReassignJavaInfoBar(destination); destination->SetJavaDelegate(java_translate_delegate_.Release()); } |