Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(49)

Side by Side Diff: content/browser/android/web_contents_observer_android.cc

Issue 139493008: [android_webview] Call onPageFinished for anchor navigations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix indent Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 const LoadCommittedDetails& details, 123 const LoadCommittedDetails& details,
124 const FrameNavigateParams& params) { 124 const FrameNavigateParams& params) {
125 JNIEnv* env = AttachCurrentThread(); 125 JNIEnv* env = AttachCurrentThread();
126 ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env)); 126 ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env));
127 if (obj.is_null()) 127 if (obj.is_null())
128 return; 128 return;
129 ScopedJavaLocalRef<jstring> jstring_url( 129 ScopedJavaLocalRef<jstring> jstring_url(
130 ConvertUTF8ToJavaString(env, params.url.spec())); 130 ConvertUTF8ToJavaString(env, params.url.spec()));
131 ScopedJavaLocalRef<jstring> jstring_base_url( 131 ScopedJavaLocalRef<jstring> jstring_base_url(
132 ConvertUTF8ToJavaString(env, params.base_url.spec())); 132 ConvertUTF8ToJavaString(env, params.base_url.spec()));
133 Java_WebContentsObserverAndroid_didNavigateMainFrame( 133 // See http://crbug.com/251330 for why it's determined this way.
134 bool in_page_navigation =
135 details.type == NAVIGATION_TYPE_IN_PAGE || details.is_in_page;
136 // TODO(mkosiba): delete once downstream rolls.
137 Java_WebContentsObserverAndroid_didNavigateMainFrameV_JLS_JLS_Z(
134 env, obj.obj(), jstring_url.obj(), jstring_base_url.obj(), 138 env, obj.obj(), jstring_url.obj(), jstring_base_url.obj(),
135 details.is_navigation_to_different_page()); 139 details.is_navigation_to_different_page());
140 Java_WebContentsObserverAndroid_didNavigateMainFrameV_JLS_JLS_Z_Z(
141 env, obj.obj(), jstring_url.obj(), jstring_base_url.obj(),
142 details.is_navigation_to_different_page(), in_page_navigation);
136 } 143 }
137 144
138 void WebContentsObserverAndroid::DidNavigateAnyFrame( 145 void WebContentsObserverAndroid::DidNavigateAnyFrame(
139 const LoadCommittedDetails& details, 146 const LoadCommittedDetails& details,
140 const FrameNavigateParams& params) { 147 const FrameNavigateParams& params) {
141 JNIEnv* env = AttachCurrentThread(); 148 JNIEnv* env = AttachCurrentThread();
142 ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env)); 149 ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env));
143 if (obj.is_null()) 150 if (obj.is_null())
144 return; 151 return;
145 ScopedJavaLocalRef<jstring> jstring_url( 152 ScopedJavaLocalRef<jstring> jstring_url(
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 is_provisional_load, 274 is_provisional_load,
268 is_main_frame, 275 is_main_frame,
269 error_code, 276 error_code,
270 jstring_error_description.obj(), jstring_url.obj()); 277 jstring_error_description.obj(), jstring_url.obj());
271 } 278 }
272 279
273 bool RegisterWebContentsObserverAndroid(JNIEnv* env) { 280 bool RegisterWebContentsObserverAndroid(JNIEnv* env) {
274 return RegisterNativesImpl(env); 281 return RegisterNativesImpl(env);
275 } 282 }
276 } // namespace content 283 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698