| Index: content/browser/android/web_contents_observer_android.cc
|
| diff --git a/content/browser/android/web_contents_observer_android.cc b/content/browser/android/web_contents_observer_android.cc
|
| index 19a622a3829ab564abdefb4e2e8bfe5f70975ccc..108600773fa27e98a019d692759af298b51c64d2 100644
|
| --- a/content/browser/android/web_contents_observer_android.cc
|
| +++ b/content/browser/android/web_contents_observer_android.cc
|
| @@ -16,6 +16,7 @@
|
| #include "content/browser/web_contents/web_contents_impl.h"
|
| #include "content/public/browser/navigation_details.h"
|
| #include "content/public/browser/navigation_entry.h"
|
| +#include "content/public/common/url_constants.h"
|
| #include "jni/WebContentsObserverAndroid_jni.h"
|
|
|
| using base::android::AttachCurrentThread;
|
| @@ -215,6 +216,7 @@ void WebContentsObserverAndroid::DidFinishLoad(
|
| return;
|
|
|
| std::string url_string = validated_url.spec();
|
| + bool is_error_page = content::kUnreachableWebDataURL == url_string;
|
| NavigationEntry* entry =
|
| web_contents()->GetController().GetLastCommittedEntry();
|
| // Note that GetBaseURLForDataURL is only used by the Android WebView.
|
| @@ -223,8 +225,12 @@ void WebContentsObserverAndroid::DidFinishLoad(
|
|
|
| ScopedJavaLocalRef<jstring> jstring_url(
|
| ConvertUTF8ToJavaString(env, url_string));
|
| - Java_WebContentsObserverAndroid_didFinishLoad(
|
| - env, obj.obj(), frame_id, jstring_url.obj(), is_main_frame);
|
| + Java_WebContentsObserverAndroid_didFinishLoad(env,
|
| + obj.obj(),
|
| + frame_id,
|
| + jstring_url.obj(),
|
| + is_main_frame,
|
| + is_error_page);
|
| }
|
|
|
| void WebContentsObserverAndroid::NavigationEntryCommitted(
|
|
|