| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "content/browser/android/content_view_client.h" | 5 #include "content/browser/android/content_view_client.h" |
| 6 | 6 |
| 7 #include <android/keycodes.h> | 7 #include <android/keycodes.h> |
| 8 | 8 |
| 9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
| 10 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 ConvertUTF8ToJavaString(env, url.spec()); | 91 ConvertUTF8ToJavaString(env, url.spec()); |
| 92 ScopedJavaLocalRef<jstring> jstring_url = | 92 ScopedJavaLocalRef<jstring> jstring_url = |
| 93 ConvertUTF8ToJavaString(env, url.spec()); | 93 ConvertUTF8ToJavaString(env, url.spec()); |
| 94 | 94 |
| 95 Java_ContentViewClient_onReceivedError( | 95 Java_ContentViewClient_onReceivedError( |
| 96 env, weak_java_client_.get(env).obj(), | 96 env, weak_java_client_.get(env).obj(), |
| 97 ToContentViewClientError(error_code), | 97 ToContentViewClientError(error_code), |
| 98 jstring_error_description.obj(), jstring_url.obj()); | 98 jstring_error_description.obj(), jstring_url.obj()); |
| 99 } | 99 } |
| 100 | 100 |
| 101 void ContentViewClient::OnReceivedHttpAuthRequest( | |
| 102 jobject auth_handler, | |
| 103 const string16& host, | |
| 104 const string16& realm) { | |
| 105 JNIEnv* env = AttachCurrentThread(); | |
| 106 ScopedJavaLocalRef<jstring> jstring_host = | |
| 107 ConvertUTF16ToJavaString(env, host); | |
| 108 ScopedJavaLocalRef<jstring> jstring_realm = | |
| 109 ConvertUTF16ToJavaString(env, realm); | |
| 110 Java_ContentViewClient_onReceivedHttpAuthRequest( | |
| 111 env, weak_java_client_.get(env).obj(), | |
| 112 auth_handler, | |
| 113 jstring_host.obj(), | |
| 114 jstring_realm.obj()); | |
| 115 } | |
| 116 | |
| 117 void ContentViewClient::OnDidCommitMainFrame(const GURL& url, | 101 void ContentViewClient::OnDidCommitMainFrame(const GURL& url, |
| 118 const GURL& base_url) { | 102 const GURL& base_url) { |
| 119 JNIEnv* env = AttachCurrentThread(); | 103 JNIEnv* env = AttachCurrentThread(); |
| 120 ScopedJavaLocalRef<jstring> jstring_url = | 104 ScopedJavaLocalRef<jstring> jstring_url = |
| 121 ConvertUTF8ToJavaString(env, url.spec()); | 105 ConvertUTF8ToJavaString(env, url.spec()); |
| 122 ScopedJavaLocalRef<jstring> jstring_base_url = | 106 ScopedJavaLocalRef<jstring> jstring_base_url = |
| 123 ConvertUTF8ToJavaString(env, base_url.spec()); | 107 ConvertUTF8ToJavaString(env, base_url.spec()); |
| 124 | 108 |
| 125 Java_ContentViewClient_onMainFrameCommitted( | 109 Java_ContentViewClient_onMainFrameCommitted( |
| 126 env, weak_java_client_.get(env).obj(), | 110 env, weak_java_client_.get(env).obj(), |
| (...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 590 | 574 |
| 591 bool RegisterContentViewClient(JNIEnv* env) { | 575 bool RegisterContentViewClient(JNIEnv* env) { |
| 592 if (!HasClass(env, kContentViewClientClassPath)) { | 576 if (!HasClass(env, kContentViewClientClassPath)) { |
| 593 DLOG(ERROR) << "Unable to find class ContentViewClient!"; | 577 DLOG(ERROR) << "Unable to find class ContentViewClient!"; |
| 594 return false; | 578 return false; |
| 595 } | 579 } |
| 596 return RegisterNativesImpl(env); | 580 return RegisterNativesImpl(env); |
| 597 } | 581 } |
| 598 | 582 |
| 599 } // namespace content | 583 } // namespace content |
| OLD | NEW |