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 d2c3dd3c3738c631953c950f49b9a625f2214920..f54eb5c763459dafd1bc9265ad4400516a2df62b 100644 |
--- a/content/browser/android/content_view_core_impl.cc |
+++ b/content/browser/android/content_view_core_impl.cc |
@@ -818,11 +818,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(); |
+ GURL url = web_contents_->GetVisibleURL(); |
return ConvertUTF8ToJavaString(env, url.spec()); |
} |
@@ -1431,7 +1427,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 +1502,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(); |
} |
@@ -1555,7 +1551,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; |