| 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/components/web_contents_delegate_android/web_contents_delegate
_android.h" | 5 #include "content/components/web_contents_delegate_android/web_contents_delegate
_android.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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 else | 144 else |
| 145 Java_WebContentsDelegateAndroid_onLoadStarted(env, obj.obj()); | 145 Java_WebContentsDelegateAndroid_onLoadStarted(env, obj.obj()); |
| 146 } | 146 } |
| 147 | 147 |
| 148 void WebContentsDelegateAndroid::LoadProgressChanged(WebContents* source, | 148 void WebContentsDelegateAndroid::LoadProgressChanged(WebContents* source, |
| 149 double progress) { | 149 double progress) { |
| 150 JNIEnv* env = AttachCurrentThread(); | 150 JNIEnv* env = AttachCurrentThread(); |
| 151 ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env); | 151 ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env); |
| 152 if (obj.is_null()) | 152 if (obj.is_null()) |
| 153 return; | 153 return; |
| 154 Java_WebContentsDelegateAndroid_onLoadProgressChanged( | 154 Java_WebContentsDelegateAndroid_notifyLoadProgressChanged( |
| 155 env, | 155 env, |
| 156 obj.obj(), | 156 obj.obj(), |
| 157 progress); | 157 progress); |
| 158 } | 158 } |
| 159 | 159 |
| 160 void WebContentsDelegateAndroid::CloseContents(WebContents* source) { | 160 void WebContentsDelegateAndroid::CloseContents(WebContents* source) { |
| 161 JNIEnv* env = AttachCurrentThread(); | 161 JNIEnv* env = AttachCurrentThread(); |
| 162 ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env); | 162 ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env); |
| 163 if (obj.is_null()) | 163 if (obj.is_null()) |
| 164 return; | 164 return; |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 308 | 308 |
| 309 bool RegisterWebContentsDelegateAndroid(JNIEnv* env) { | 309 bool RegisterWebContentsDelegateAndroid(JNIEnv* env) { |
| 310 if (!HasClass(env, kWebContentsDelegateAndroidClassPath)) { | 310 if (!HasClass(env, kWebContentsDelegateAndroidClassPath)) { |
| 311 DLOG(ERROR) << "Unable to find class WebContentsDelegateAndroid!"; | 311 DLOG(ERROR) << "Unable to find class WebContentsDelegateAndroid!"; |
| 312 return false; | 312 return false; |
| 313 } | 313 } |
| 314 return RegisterNativesImpl(env); | 314 return RegisterNativesImpl(env); |
| 315 } | 315 } |
| 316 | 316 |
| 317 } // namespace content | 317 } // namespace content |
| OLD | NEW |