[Offline pages] Ensuring verbose Offline status does not show next to the security padlock

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

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 0316586707af28178ece61d8c59e9e304409d2ce..55675709cb03954df95c3e6744db075c020463a5 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
@@ -671,6 +671,11 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener,
             public void onAnimationEnd(Animator animation) {
                 if (animation == mSecurityButtonShowAnimator) {
                     mNavigationButton.setVisibility(INVISIBLE);
+                    // This is done specifically not to show offline page verbose status with the
+                    // icon. It should be properly solved, when omnibox verbose status animation is
+                    // implemented. See: http://crbug.com/648129
+                    updateVerboseStatusVisibility();
+                    setUrlToPageUrl();

[Ted C, 2016/10/12 23:46:22]

why setUrlToPageUrl?  That doesn't look right to me.

[fgorski, 2016/10/13 18:04:35]

If we don't we can get padlock shown with a scheme stripped URL in situation,
where the offline page is reloaded to an online version, which is https://

Per the second comment I am moving the whole code outside of if and straight to
the animation end.

Keeping the setUrlToPageUrl() after the updateVerboseStatusVisibility() with a
comment, but if you prefer not to have it, I am fine with removing it.

I can make that call from inside updateVerboseStatusVisibility() if you think
that's better, but that is inconsistent with what the method is meant to do, and
may cause problems in other places.

                 } else if (animation == mNavigationIconShowAnimator) {
                     mSecurityButton.setVisibility(INVISIBLE);
                 }
@@ -1389,8 +1394,8 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener,
      * omnibox.
      */
     private void updateVerboseStatusVisibility() {
-        boolean verboseStatusVisible =
-                mNavigationButtonType == NavigationButtonType.OFFLINE && !mUrlHasFocus;
+        boolean verboseStatusVisible = mNavigationButtonType == NavigationButtonType.OFFLINE
+                && !mUrlHasFocus && mNavigationButton.getVisibility() == VISIBLE;
 
         int verboseStatusVisibility = verboseStatusVisible ? VISIBLE : GONE;