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 8de6d793a1a68c7dcaa323029462f6d831ee0cb1..93555d8bc0b6057b38ed15ce34b0aa32613386e7 100644 |
--- a/content/browser/android/content_view_core_impl.cc |
+++ b/content/browser/android/content_view_core_impl.cc |
@@ -822,12 +822,7 @@ jint ContentViewCoreImpl::GetCurrentRenderProcessId(JNIEnv* env, jobject obj) { |
ScopedJavaLocalRef<jstring> ContentViewCoreImpl::GetURL( |
JNIEnv* env, jobject) const { |
- // 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()); |
+ return ConvertUTF8ToJavaString(env, GetWebContents()->GetURL().spec()); |
} |
ScopedJavaLocalRef<jstring> ContentViewCoreImpl::GetTitle( |
@@ -1435,7 +1430,7 @@ void ContentViewCoreImpl::GetDirectedNavigationHistory(JNIEnv* env, |
ScopedJavaLocalRef<jstring> |
ContentViewCoreImpl::GetOriginalUrlForActiveNavigationEntry(JNIEnv* env, |
jobject obj) { |
- NavigationEntry* entry = web_contents_->GetController().GetActiveEntry(); |
+ NavigationEntry* entry = web_contents_->GetController().GetVisibleEntry(); |
if (entry == NULL) |
return ScopedJavaLocalRef<jstring>(env, NULL); |
return ConvertUTF8ToJavaString(env, entry->GetOriginalRequestURL().spec()); |
@@ -1506,7 +1501,7 @@ void ContentViewCoreImpl::EvaluateJavaScript(JNIEnv* env, |
bool ContentViewCoreImpl::GetUseDesktopUserAgent( |
JNIEnv* env, jobject obj) { |
- NavigationEntry* entry = web_contents_->GetController().GetActiveEntry(); |
+ NavigationEntry* entry = web_contents_->GetController().GetVisibleEntry(); |
return entry && entry->GetIsOverridingUserAgent(); |
} |
@@ -1548,7 +1543,7 @@ void ContentViewCoreImpl::SetUseDesktopUserAgent( |
return; |
// Make sure the navigation entry actually exists. |
- NavigationEntry* entry = web_contents_->GetController().GetActiveEntry(); |
+ NavigationEntry* entry = web_contents_->GetController().GetVisibleEntry(); |
if (!entry) |
return; |