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/web_contents_observer_android.h" | 5 #include "content/browser/android/web_contents_observer_android.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include <jni.h> | 9 #include <jni.h> |
10 | 10 |
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
157 const LoadCommittedDetails& details, | 157 const LoadCommittedDetails& details, |
158 const FrameNavigateParams& params) { | 158 const FrameNavigateParams& params) { |
159 JNIEnv* env = AttachCurrentThread(); | 159 JNIEnv* env = AttachCurrentThread(); |
160 ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env)); | 160 ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env)); |
161 if (obj.is_null()) | 161 if (obj.is_null()) |
162 return; | 162 return; |
163 ScopedJavaLocalRef<jstring> jstring_url( | 163 ScopedJavaLocalRef<jstring> jstring_url( |
164 ConvertUTF8ToJavaString(env, params.url.spec())); | 164 ConvertUTF8ToJavaString(env, params.url.spec())); |
165 ScopedJavaLocalRef<jstring> jstring_base_url( | 165 ScopedJavaLocalRef<jstring> jstring_base_url( |
166 ConvertUTF8ToJavaString(env, params.base_url.spec())); | 166 ConvertUTF8ToJavaString(env, params.base_url.spec())); |
167 jboolean jboolean_is_reload = | 167 jboolean jboolean_is_reload = ui::PageTransitionCoreTypeIs( |
168 PageTransitionCoreTypeIs(params.transition, PAGE_TRANSITION_RELOAD); | 168 params.transition, ui::PAGE_TRANSITION_RELOAD); |
169 | 169 |
170 Java_WebContentsObserverAndroid_didNavigateAnyFrame( | 170 Java_WebContentsObserverAndroid_didNavigateAnyFrame( |
171 env, obj.obj(), jstring_url.obj(), jstring_base_url.obj(), | 171 env, obj.obj(), jstring_url.obj(), jstring_base_url.obj(), |
172 jboolean_is_reload); | 172 jboolean_is_reload); |
173 } | 173 } |
174 | 174 |
175 void WebContentsObserverAndroid::DidStartProvisionalLoadForFrame( | 175 void WebContentsObserverAndroid::DidStartProvisionalLoadForFrame( |
176 RenderFrameHost* render_frame_host, | 176 RenderFrameHost* render_frame_host, |
177 const GURL& validated_url, | 177 const GURL& validated_url, |
178 bool is_error_page, | 178 bool is_error_page, |
(...skipping 15 matching lines...) Expand all Loading... |
194 : -1, | 194 : -1, |
195 !render_frame_host->GetParent(), | 195 !render_frame_host->GetParent(), |
196 jstring_url.obj(), | 196 jstring_url.obj(), |
197 is_error_page, | 197 is_error_page, |
198 is_iframe_srcdoc); | 198 is_iframe_srcdoc); |
199 } | 199 } |
200 | 200 |
201 void WebContentsObserverAndroid::DidCommitProvisionalLoadForFrame( | 201 void WebContentsObserverAndroid::DidCommitProvisionalLoadForFrame( |
202 RenderFrameHost* render_frame_host, | 202 RenderFrameHost* render_frame_host, |
203 const GURL& url, | 203 const GURL& url, |
204 PageTransition transition_type) { | 204 ui::PageTransition transition_type) { |
205 JNIEnv* env = AttachCurrentThread(); | 205 JNIEnv* env = AttachCurrentThread(); |
206 ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env)); | 206 ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env)); |
207 if (obj.is_null()) | 207 if (obj.is_null()) |
208 return; | 208 return; |
209 ScopedJavaLocalRef<jstring> jstring_url( | 209 ScopedJavaLocalRef<jstring> jstring_url( |
210 ConvertUTF8ToJavaString(env, url.spec())); | 210 ConvertUTF8ToJavaString(env, url.spec())); |
211 Java_WebContentsObserverAndroid_didCommitProvisionalLoadForFrame( | 211 Java_WebContentsObserverAndroid_didCommitProvisionalLoadForFrame( |
212 env, | 212 env, |
213 obj.obj(), | 213 obj.obj(), |
214 render_frame_host->GetRoutingID(), | 214 render_frame_host->GetRoutingID(), |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
314 if (obj.is_null()) | 314 if (obj.is_null()) |
315 return; | 315 return; |
316 Java_WebContentsObserverAndroid_didFirstVisuallyNonEmptyPaint( | 316 Java_WebContentsObserverAndroid_didFirstVisuallyNonEmptyPaint( |
317 env, obj.obj()); | 317 env, obj.obj()); |
318 } | 318 } |
319 | 319 |
320 bool RegisterWebContentsObserverAndroid(JNIEnv* env) { | 320 bool RegisterWebContentsObserverAndroid(JNIEnv* env) { |
321 return RegisterNativesImpl(env); | 321 return RegisterNativesImpl(env); |
322 } | 322 } |
323 } // namespace content | 323 } // namespace content |
OLD | NEW |