From d76aa8a7228752994b371fc3e9a88f93ae6b2d16 Mon Sep 17 00:00:00 2001
From: AlexeyBarabash <alexey@brave.com>
Date: Thu, 10 Oct 2024 15:38:11 +0300
Subject: [PATCH] fixed codereview notice

---
 .../BraveTabbedNavigationBarColorControllerBase.java      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedNavigationBarColorControllerBase.java b/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedNavigationBarColorControllerBase.java
index d6bd9b789e0..8dc5b4a7108 100644
--- a/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedNavigationBarColorControllerBase.java
+++ b/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedNavigationBarColorControllerBase.java
@@ -9,6 +9,7 @@
 import android.os.Build;
 
 import androidx.annotation.ColorInt;
+import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 
 import org.chromium.base.BraveReflectionUtil;
@@ -24,9 +25,9 @@ class BraveTabbedNavigationBarColorControllerBase {
      * This variable will be used instead of `TabGroupModelFilter#mContext`, that will be deleted in
      * bytecode.
      */
-    protected Context mContext;
+    protected @Nullable Context mContext;
 
-    protected TabModelSelector mTabModelSelector;
+    protected @Nullable TabModelSelector mTabModelSelector;
 
     // Calls from the upstream's private function
     // `TabbedNavigationBarColorController#getNavigationBarColor`
@@ -36,7 +37,8 @@ public int getNavigationBarColor(boolean forceDarkNavigationBar) {
         // Adjust navigation bar color to match the bottom toolbar color when it is visible.
         if (BottomToolbarConfiguration.isBottomToolbarEnabled()
                 && BraveMenuButtonCoordinator.isMenuFromBottom()
-                && mContext != null) {
+                && mContext != null
+                && mTabModelSelector != null) {
             if (mTabModelSelector.isIncognitoSelected()) {
                 return mContext.getColor(R.color.toolbar_background_primary_dark);
             } else {