[Home] Start closing the bottom sheet before clearing URL focus

Start closing the bottom sheet before clearing URL focus on backpress to
prevent "Search or type URL" from temporarily showing while the bottom
sheet is closing.

BUG=789775

Change-Id: I79bc1013b5dc91cc4ff94a8df86a7df7996b2d69
Reviewed-on: https://chromium-review.googlesource.com/807345Reviewed-by: Ted Choc <tedchoc@chromium.org>
Commit-Queue: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521572}

chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarPhone.java

@@ -390,11 +390,11 @@ public class LocationBarPhone extends LocationBarLayout {
 
     @Override
     public void backKeyPressed() {
-        super.backKeyPressed();
-
         if (mCloseSheetOnBackButton) {
             mBottomSheet.setSheetState(BottomSheet.SHEET_STATE_PEEK, true);
         }
         mCloseSheetOnBackButton = false;
+
+        super.backKeyPressed();
     }
 }

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java

@@ -108,7 +108,7 @@ class ToolbarModelImpl extends ToolbarModel implements ToolbarDataProvider, Tool
 
     @Override
     public String getText() {
-        if (isBottomSheetOpen()) return "";
+        if (clearUrlForBottomSheetOpen()) return "";
 
         String displayText = super.getText();
 
@@ -199,7 +199,7 @@ class ToolbarModelImpl extends ToolbarModel implements ToolbarDataProvider, Tool
 
     @Override
     public boolean shouldShowSecurityIcon() {
-        return !isBottomSheetOpen() && getSecurityIconResource() != 0;
+        return !clearUrlForBottomSheetOpen() && getSecurityIconResource() != 0;
     }
 
     @Override
@@ -207,7 +207,7 @@ class ToolbarModelImpl extends ToolbarModel implements ToolbarDataProvider, Tool
         // Because is offline page is cleared a bit slower, we also ensure that connection security
         // level is NONE or HTTP_SHOW_WARNING (http://crbug.com/671453).
         int securityLevel = getSecurityLevel();
-        return !isBottomSheetOpen() && isOfflinePage()
+        return !clearUrlForBottomSheetOpen() && isOfflinePage()
                 && (securityLevel == ConnectionSecurityLevel.NONE
                            || securityLevel == ConnectionSecurityLevel.HTTP_SHOW_WARNING);
     }
@@ -257,8 +257,9 @@ class ToolbarModelImpl extends ToolbarModel implements ToolbarDataProvider, Tool
         return 0;
     }
 
-    private boolean isBottomSheetOpen() {
+    private boolean clearUrlForBottomSheetOpen() {
         return mBottomSheet != null && mBottomSheet.isSheetOpen()
+                && mBottomSheet.getTargetSheetState() != BottomSheet.SHEET_STATE_PEEK
                 && ChromeFeatureList.isEnabled(ChromeFeatureList.CHROME_HOME_CLEAR_URL_ON_OPEN);
     }
 }