Uplift of #8297 (squashed) to beta

brave · Mar 18, 2021 · de73545 · de73545
1 parent 0e81ae4
commit de73545
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java
@@ -1192,6 +1192,9 @@ protected void onDraw(Canvas canvas) {
         if (BraveReflectionUtil.EqualTypes(this.getClass(), CustomTabToolbar.class)
                 || BraveReflectionUtil.EqualTypes(this.getClass(), ToolbarPhone.class)) {
             updateMenuButtonState();
+            if (getToolbarDataProvider() != null && getToolbarDataProvider().getTab() != null) {
+                updateBraveShieldsButtonState(getToolbarDataProvider().getTab());
+            }
         }
         super.onDraw(canvas);
     }