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

Unified Diff: chrome/browser/android/url_utilities.cc

Issue 54513003: Export "Enter URL..." string to Android Java side. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 1 month 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
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/UrlUtilities.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/url_utilities.cc
diff --git a/chrome/browser/android/url_utilities.cc b/chrome/browser/android/url_utilities.cc
index 5acd960351c1048dbe62c334de56c6da4cac8ae1..85c04b92a0d5a90ce248719f0b8f52d26d0b596e 100644
--- a/chrome/browser/android/url_utilities.cc
+++ b/chrome/browser/android/url_utilities.cc
@@ -5,6 +5,7 @@
#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
#include "chrome/browser/google/google_util.h"
+#include "chrome/common/net/url_fixer_upper.h"
#include "jni/UrlUtilities_jni.h"
#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
#include "url/gurl.h"
@@ -69,6 +70,18 @@ static jboolean IsGoogleHomePageUrl(JNIEnv* env, jclass clazz, jstring url) {
return google_util::IsGoogleHomePageUrl(gurl);
}
+static jstring FixupUrl(JNIEnv* env,
+ jclass clazz,
+ jstring url,
+ jstring desired_tld) {
+ GURL fixed_url = URLFixerUpper::FixupURL(
+ base::android::ConvertJavaStringToUTF8(env, url),
+ base::android::ConvertJavaStringToUTF8(env, desired_tld));
+
+ return base::android::ConvertUTF8ToJavaString(env, fixed_url.spec())
+ .Release();
+}
+
// Register native methods
bool RegisterUrlUtilities(JNIEnv* env) {
return RegisterNativesImpl(env);
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/UrlUtilities.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698