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

Unified Diff: content/browser/android/content_view_core_impl.cc

Issue 12541018: Allow showing pending URL for new tab navigations, but only if safe. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Android test. Created 7 years, 9 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 side-by-side diff with in-line comments
Download patch
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..a65a490a5a201c91734a8fa963009d7b0fc64767 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -748,7 +748,10 @@ void ContentViewCoreImpl::SetAllUserAgentOverridesInHistory(
ScopedJavaLocalRef<jstring> ContentViewCoreImpl::GetURL(
JNIEnv* env, jobject) const {
- return ConvertUTF8ToJavaString(env, GetWebContents()->GetURL().spec());
+ content::NavigationEntry* entry =
joth 2013/03/22 17:12:52 I think this should comment why it's not using Get
Charlie Reis 2013/03/28 19:23:19 Done.
+ web_contents_->GetController().GetActiveEntry();
+ GURL url = entry ? entry->GetVirtualURL() : GURL::EmptyGURL();
+ return ConvertUTF8ToJavaString(env, url.spec());
}
ScopedJavaLocalRef<jstring> ContentViewCoreImpl::GetTitle(

Powered by Google App Engine
This is Rietveld 408576698