diff options
Diffstat (limited to 'chrome/browser')
4 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/android/dev_tools_server.cc b/chrome/browser/android/dev_tools_server.cc index 6302666..5ab467a 100644 --- a/chrome/browser/android/dev_tools_server.cc +++ b/chrome/browser/android/dev_tools_server.cc @@ -439,27 +439,27 @@ bool RegisterDevToolsServer(JNIEnv* env) { return RegisterNativesImpl(env); } -static jint InitRemoteDebugging(JNIEnv* env, +static jlong InitRemoteDebugging(JNIEnv* env, jobject obj, jstring socket_name_prefix) { DevToolsServer* server = new DevToolsServer( base::android::ConvertJavaStringToUTF8(env, socket_name_prefix)); - return reinterpret_cast<jint>(server); + return reinterpret_cast<intptr_t>(server); } -static void DestroyRemoteDebugging(JNIEnv* env, jobject obj, jint server) { +static void DestroyRemoteDebugging(JNIEnv* env, jobject obj, jlong server) { delete reinterpret_cast<DevToolsServer*>(server); } static jboolean IsRemoteDebuggingEnabled(JNIEnv* env, jobject obj, - jint server) { + jlong server) { return reinterpret_cast<DevToolsServer*>(server)->IsStarted(); } static void SetRemoteDebuggingEnabled(JNIEnv* env, jobject obj, - jint server, + jlong server, jboolean enabled) { DevToolsServer* devtools_server = reinterpret_cast<DevToolsServer*>(server); if (enabled) { diff --git a/chrome/browser/android/omnibox/omnibox_prerender.cc b/chrome/browser/android/omnibox/omnibox_prerender.cc index 8c7b952..8c6a08c 100644 --- a/chrome/browser/android/omnibox/omnibox_prerender.cc +++ b/chrome/browser/android/omnibox/omnibox_prerender.cc @@ -63,7 +63,7 @@ void OmniboxPrerender::PrerenderMaybe(JNIEnv* env, jobject obj, jstring j_url, jstring j_current_url, - jint jsource_match, + jlong jsource_match, jobject j_profile_android, jobject j_tab) { AutocompleteResult* autocomplete_result = diff --git a/chrome/browser/android/omnibox/omnibox_prerender.h b/chrome/browser/android/omnibox/omnibox_prerender.h index 4ae4401..adfe301 100644 --- a/chrome/browser/android/omnibox/omnibox_prerender.h +++ b/chrome/browser/android/omnibox/omnibox_prerender.h @@ -50,7 +50,7 @@ class OmniboxPrerender { jobject obj, jstring j_url, jstring j_current_url, - jint jsource_match, + jlong jsource_match, jobject j_profile_android, jobject j_tab); diff --git a/chrome/browser/ui/android/ssl_client_certificate_request.cc b/chrome/browser/ui/android/ssl_client_certificate_request.cc index e86eb27..a6f3359 100644 --- a/chrome/browser/ui/android/ssl_client_certificate_request.cc +++ b/chrome/browser/ui/android/ssl_client_certificate_request.cc @@ -105,7 +105,7 @@ void StartClientCertificateRequest( scoped_ptr<chrome::SelectCertificateCallback> request( new chrome::SelectCertificateCallback(callback)); - jint request_id = reinterpret_cast<jint>(request.get()); + jlong request_id = reinterpret_cast<intptr_t>(request.get()); if (!chrome::android:: Java_SSLClientCertificateRequest_selectClientCertificate( @@ -144,7 +144,7 @@ namespace android { static void OnSystemRequestCompletion( JNIEnv* env, jclass clazz, - jint request_id, + jlong request_id, jobjectArray encoded_chain_ref, jobject private_key_ref) { DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); |