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

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.webapps;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.text.Layout;
 import android.text.TextUtils;
@@ skipping 132 matching lines @@
             return URI.create(url);
         } catch (IllegalArgumentException exception) {
             Log.e(TAG, "Failed to convert URI: ", exception);
             return null;
         }
     }
 
     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);
             mIconResourceWidths.put(mCurrentIconResource, icon.getIntrinsicWidth());
         }
 
         ApiCompatibilityUtils.setCompoundDrawablesRelativeWithIntrinsicBounds(mUrlBar,
                 mCurrentIconResource, 0, 0, 0);
     }
 
     private void updateDisplayedUrl(String originalUrl, URI uri) {
         boolean showScheme = mCurrentIconResource == 0;
         String displayUrl = originalUrl;
         if (uri != null) {
             String shortenedUrl = UrlFormatter.formatUrlForSecurityDisplay(uri, showScheme);
             if (!TextUtils.isEmpty(shortenedUrl)) displayUrl = shortenedUrl;
         }
 
         mUrlBar.setText(displayUrl);
         if (!TextUtils.equals(mCurrentlyDisplayedUrl, displayUrl)) {
             mCurrentlyDisplayedUrl = displayUrl;
         }
     }
 }