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 79d7d9d667a3722d5735f67922d166f46019357b..ade5d12783b9c3c7908c5494bd1db32eac487d84 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 |
@@ -1211,10 +1211,13 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener, |
setUrlToPageUrl(); |
} |
} |
- |
+ int id = getSecurityIconResource(securityLevel, !shouldEmphasizeHttpsScheme()); |
// ImageView#setImageResource is no-op if given resource is the current one. |
- mSecurityButton.setImageResource( |
- getSecurityIconResource(securityLevel, !shouldEmphasizeHttpsScheme())); |
+ if (id == 0) { |
+ mSecurityButton.setImageDrawable(null); |
+ } else { |
+ mSecurityButton.setImageResource(id); |
+ } |
if (mSecurityIconType == securityLevel) return; |
mSecurityIconType = securityLevel; |
@@ -1284,7 +1287,7 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener, |
mNavigationButton.setImageResource(R.drawable.ic_omnibox_magnifier); |
break; |
case EMPTY: |
- mNavigationButton.setImageResource(0); |
+ mNavigationButton.setImageDrawable(null); |
break; |
default: |
assert false; |