| Index: chrome/android/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
|
| index 4130191c52b594731094dc77131bda630ea51283..696693b9eed3178c0c4eb60ac7efec38fc1a464a 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
|
| @@ -845,21 +845,18 @@ public class UrlBar extends VerticallyFixedEditText {
|
| mAccessibilityTextOverride = accessibilityOverride;
|
| }
|
|
|
| - private void scrollToTLD() {
|
| + /**
|
| + * Scroll to ensure the TLD is visible.
|
| + * @return Whether the TLD was discovered and successfully scrolled to.
|
| + */
|
| + public boolean scrollToTLD() {
|
| Editable url = getText();
|
| - if (url == null || url.length() < 1) return;
|
| + if (url == null || url.length() < 1) return false;
|
| String urlString = url.toString();
|
| - URL javaUrl;
|
| - try {
|
| - javaUrl = new URL(urlString);
|
| - } catch (MalformedURLException mue) {
|
| - return;
|
| - }
|
| - String host = javaUrl.getHost();
|
| - if (host == null || host.isEmpty()) return;
|
| - int hostStart = urlString.indexOf(host);
|
| - int hostEnd = hostStart + host.length();
|
| - setSelection(hostEnd);
|
| + String prePath = LocationBarLayout.splitPathFromUrlDisplayText(urlString).first;
|
| + if (prePath == null || prePath.isEmpty()) return false;
|
| + setSelection(prePath.length());
|
| + return true;
|
| }
|
|
|
| @Override
|
|
|