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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
147 // is actually a fragment navigation, or a history API navigation to a URL | 147 // is actually a fragment navigation, or a history API navigation to a URL |
148 // that would also be valid for a fragment navigation. | 148 // that would also be valid for a fragment navigation. |
149 bool is_fragment_navigation = urls_same_ignoring_fragment && | 149 bool is_fragment_navigation = urls_same_ignoring_fragment && |
150 (details.type == NAVIGATION_TYPE_IN_PAGE || details.is_in_page); | 150 (details.type == NAVIGATION_TYPE_IN_PAGE || details.is_in_page); |
151 Java_WebContentsObserverAndroid_didNavigateMainFrame( | 151 Java_WebContentsObserverAndroid_didNavigateMainFrame( |
152 env, obj.obj(), jstring_url.obj(), jstring_base_url.obj(), | 152 env, obj.obj(), jstring_url.obj(), jstring_base_url.obj(), |
153 details.is_navigation_to_different_page(), is_fragment_navigation); | 153 details.is_navigation_to_different_page(), is_fragment_navigation); |
154 } | 154 } |
155 | 155 |
156 void WebContentsObserverAndroid::DidNavigateAnyFrame( | 156 void WebContentsObserverAndroid::DidNavigateAnyFrame( |
| 157 RenderFrameHost* render_frame_host, |
157 const LoadCommittedDetails& details, | 158 const LoadCommittedDetails& details, |
158 const FrameNavigateParams& params) { | 159 const FrameNavigateParams& params) { |
159 JNIEnv* env = AttachCurrentThread(); | 160 JNIEnv* env = AttachCurrentThread(); |
160 ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env)); | 161 ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env)); |
161 if (obj.is_null()) | 162 if (obj.is_null()) |
162 return; | 163 return; |
163 ScopedJavaLocalRef<jstring> jstring_url( | 164 ScopedJavaLocalRef<jstring> jstring_url( |
164 ConvertUTF8ToJavaString(env, params.url.spec())); | 165 ConvertUTF8ToJavaString(env, params.url.spec())); |
165 ScopedJavaLocalRef<jstring> jstring_base_url( | 166 ScopedJavaLocalRef<jstring> jstring_base_url( |
166 ConvertUTF8ToJavaString(env, params.base_url.spec())); | 167 ConvertUTF8ToJavaString(env, params.base_url.spec())); |
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
314 if (obj.is_null()) | 315 if (obj.is_null()) |
315 return; | 316 return; |
316 Java_WebContentsObserverAndroid_didFirstVisuallyNonEmptyPaint( | 317 Java_WebContentsObserverAndroid_didFirstVisuallyNonEmptyPaint( |
317 env, obj.obj()); | 318 env, obj.obj()); |
318 } | 319 } |
319 | 320 |
320 bool RegisterWebContentsObserverAndroid(JNIEnv* env) { | 321 bool RegisterWebContentsObserverAndroid(JNIEnv* env) { |
321 return RegisterNativesImpl(env); | 322 return RegisterNativesImpl(env); |
322 } | 323 } |
323 } // namespace content | 324 } // namespace content |
OLD | NEW |