Commit 7b5dde84 authored by Robert Ogden's avatar Robert Ogden Committed by Commit Bot

Show the original host in Android Omnibox during pending HTTPS Previews

The Virtual URL handling won't work while the navigation is pending.
So, for every time the URL is updated on Android, check if the visible
URL is a HTTPS Server Preview URL and if so, return the original host.

Bug: 894881
Change-Id: I143c70bdb1b2985ed0c475b603cb25cf93d7468a
Reviewed-on: https://chromium-review.googlesource.com/c/1280859Reviewed-by: default avatarRyan Sturm <ryansturm@chromium.org>
Commit-Queue: Robert Ogden <robertogden@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599722}
parent ed2b20b6
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <memory> #include <memory>
#include "base/android/jni_android.h" #include "base/android/jni_android.h"
#include "chrome/browser/previews/previews_lite_page_navigation_throttle.h"
#include "chrome/browser/previews/previews_ui_tab_helper.h" #include "chrome/browser/previews/previews_ui_tab_helper.h"
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
#include "jni/PreviewsAndroidBridge_jni.h" #include "jni/PreviewsAndroidBridge_jni.h"
...@@ -51,11 +52,17 @@ PreviewsAndroidBridge::GetOriginalHost( ...@@ -51,11 +52,17 @@ PreviewsAndroidBridge::GetOriginalHost(
if (!web_contents) if (!web_contents)
return base::android::ScopedJavaLocalRef<jstring>(); return base::android::ScopedJavaLocalRef<jstring>();
// TODO(crbug.com/894881): Add the Lite Pages URL rewriting during a pending GURL visible_url = web_contents->GetVisibleURL();
// navigation.
std::string original_url;
if (PreviewsLitePageNavigationThrottle::GetOriginalURL(visible_url,
&original_url)) {
return base::android::ScopedJavaLocalRef<jstring>(
base::android::ConvertUTF8ToJavaString(env, GURL(original_url).host()));
}
return base::android::ScopedJavaLocalRef<jstring>( return base::android::ScopedJavaLocalRef<jstring>(
base::android::ConvertUTF8ToJavaString( base::android::ConvertUTF8ToJavaString(env, visible_url.host()));
env, web_contents->GetVisibleURL().host()));
} }
base::android::ScopedJavaLocalRef<jstring> base::android::ScopedJavaLocalRef<jstring>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment