| Index: chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
|
| index 02f38f944f4f98f59f88c33d46ca57e27e45eb46..ababf32751cc701eb4ff0323fe4739825a54c5b4 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
|
| @@ -333,6 +333,11 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener,
|
| return true;
|
| }
|
| }
|
| + } else if (keyCode == KeyEvent.KEYCODE_ESCAPE) {
|
| + if (event.getAction() == KeyEvent.ACTION_DOWN && event.getRepeatCount() == 0) {
|
| + revertChanges();
|
| + return true;
|
| + }
|
| }
|
| return false;
|
| }
|
| @@ -899,11 +904,14 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener,
|
| } else {
|
| Tab tab = mToolbarDataProvider.getTab();
|
| if (NativePageFactory.isNativePageUrl(tab.getUrl(), tab.isIncognito())) {
|
| - mUrlBar.setUrl("", null);
|
| + setUrlBarText("", null);
|
| } else {
|
| - mUrlBar.setUrl(
|
| + setUrlBarText(
|
| mToolbarDataProvider.getText(), getCurrentTabUrl());
|
| + selectAll();
|
| }
|
| + hideSuggestions();
|
| + UiUtils.hideKeyboard(mUrlBar);
|
| }
|
| }
|
|
|
|
|