[Offline pages] Reinstating the offline icon on tablet and fixing verbose state/URL emphasis

This patch addresses the following problems:
* Offline icon is not shown in omnibox on tablets
* Offline verbose status is sometimes shown with green padlock
* URL emphasis lags behind security icon update.

This fix does the following:
* Moves the offline icon from the navigation button to security button
* Ensures that navigation button is never shown on phones
* Calculates when to show: navigation/security/no button, to properly
  show or hide icon container.
* Moves verbose status visibility control to security button related
  code (as that is where we show offline stuff and would show verbose
  security states)

BUG=656088,648129
R=tedchoc@chromium.org

Review-Url: https://codereview.chromium.org/2438413002
Cr-Commit-Position: refs/heads/master@{#427209}

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

@@ -497,22 +497,16 @@ public class CustomTabToolbar extends ToolbarLayout implements LocationBar,
 
         mSecurityIconType = securityLevel;
 
+        boolean isSmallDevice = !DeviceFormFactor.isTablet(getContext());
         boolean isOfflinePage = getCurrentTab() != null && getCurrentTab().isOfflinePage();
-        boolean showSecurityButton = securityLevel != ConnectionSecurityLevel.NONE || isOfflinePage;
 
-        if (securityLevel == ConnectionSecurityLevel.NONE) {
-            if (isOfflinePage && mShowsOfflinePage != isOfflinePage) {
-                TintedDrawable bolt = TintedDrawable.constructTintedDrawable(
-                        getResources(), R.drawable.offline_pin);
-                bolt.setTint(mUseDarkColors ? mDarkModeTint : mLightModeTint);
-                mSecurityButton.setImageDrawable(bolt);
-            }
-        } else {
-            boolean isSmallDevice = !DeviceFormFactor.isTablet(getContext());
-            int id = LocationBarLayout.getSecurityIconResource(securityLevel, isSmallDevice);
+        int id = LocationBarLayout.getSecurityIconResource(
+                securityLevel, isSmallDevice, isOfflinePage);
+        boolean showSecurityButton = true;
         if (id == 0) {
             // Hide the button if we don't have an actual icon to display.
             showSecurityButton = false;
+            mSecurityButton.setImageDrawable(null);
         } else {
             // ImageView#setImageResource is no-op if given resource is the current one.
             mSecurityButton.setImageResource(id);
@@ -520,7 +514,6 @@ public class CustomTabToolbar extends ToolbarLayout implements LocationBar,
                     LocationBarLayout.getColorStateList(securityLevel, getToolbarDataProvider(),
                             getResources(), false /* omnibox is not opaque */));
         }
-        }
 
         mShowsOfflinePage = isOfflinePage;
 

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

@@ -18,6 +18,7 @@ import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.toolbar.ToolbarModel.ToolbarModelDelegate;
 import org.chromium.components.dom_distiller.core.DomDistillerService;
 import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils;
+import org.chromium.components.security_state.ConnectionSecurityLevel;
 import org.chromium.content_public.browser.WebContents;
 
 /**
@@ -107,7 +108,8 @@ class ToolbarModelImpl extends ToolbarModel implements ToolbarDataProvider, Tool
                 displayText =
                         DomDistillerTabUtils.getFormattedUrlFromOriginalDistillerUrl(originalUrl);
             }
-        } else if (mTab.isOfflinePage()) {
+        } else if (mTab.isOfflinePage()
+                && mTab.getSecurityLevel() == ConnectionSecurityLevel.NONE) {
             String originalUrl = mTab.getOriginalUrl();
             displayText = OfflinePageUtils.stripSchemeFromOnlineUrl(
                   DomDistillerTabUtils.getFormattedUrlFromOriginalDistillerUrl(originalUrl));

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappUrlBar.java

@@ -150,7 +150,7 @@ public class WebappUrlBar extends FrameLayout implements View.OnLayoutChangeList
     private void updateSecurityIcon(int securityLevel) {
         boolean isSmallDevice = !DeviceFormFactor.isTablet(getContext());
         mCurrentIconResource =
-                LocationBarLayout.getSecurityIconResource(securityLevel, isSmallDevice);
+                LocationBarLayout.getSecurityIconResource(securityLevel, isSmallDevice, false);
 
         if (mCurrentIconResource != 0 && mIconResourceWidths.get(mCurrentIconResource, -1) == -1) {
             Drawable icon = ApiCompatibilityUtils.getDrawable(getResources(), mCurrentIconResource);