| Index: content/browser/android/content_view_core_impl.cc
|
| diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
|
| index 96916f497ef71bd99dab85db03744f9153892a0d..c2375b57452e87e1bbe68612eca2088babe3e6da 100644
|
| --- a/content/browser/android/content_view_core_impl.cc
|
| +++ b/content/browser/android/content_view_core_impl.cc
|
| @@ -748,7 +748,12 @@ void ContentViewCoreImpl::SetAllUserAgentOverridesInHistory(
|
|
|
| ScopedJavaLocalRef<jstring> ContentViewCoreImpl::GetURL(
|
| JNIEnv* env, jobject) const {
|
| - return ConvertUTF8ToJavaString(env, GetWebContents()->GetURL().spec());
|
| + // The current users of the Java API expect to use the active entry
|
| + // rather than the visible entry, which is exposed by WebContents::GetURL.
|
| + content::NavigationEntry* entry =
|
| + web_contents_->GetController().GetActiveEntry();
|
| + GURL url = entry ? entry->GetVirtualURL() : GURL::EmptyGURL();
|
| + return ConvertUTF8ToJavaString(env, url.spec());
|
| }
|
|
|
| ScopedJavaLocalRef<jstring> ContentViewCoreImpl::GetTitle(
|
|
|