From de73545e504a2d199446306c1f09c6c551bbd12c Mon Sep 17 00:00:00 2001
From: brave-builds <devops@brave.com>
Date: Thu, 18 Mar 2021 23:08:47 +0000
Subject: [PATCH] Uplift of #8297 (squashed) to beta

---
 .../chrome/browser/toolbar/top/BraveToolbarLayout.java         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java
index d2376aabb905..fe47a75ee043 100644
--- 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);
     }