[Home] Disable theme colors in toolbar

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.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.toolbar;
 
 import android.content.Context;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
@@ skipping 135 matching lines @@
         mPrimaryColor = color;
         Context context = ContextUtils.getApplicationContext();
         mIsUsingBrandColor = !isIncognito()
                 && mPrimaryColor != ApiCompatibilityUtils.getColor(context.getResources(),
                         R.color.default_primary_color)
                 && getTab() != null && !getTab().isNativePage();
     }
 
     @Override
     public int getPrimaryColor() {
-        if (mBottomSheet != null && mBottomSheet.isSheetOpen()
-                && mBottomSheet.getTargetSheetState() != BottomSheet.SHEET_STATE_PEEK) {
+        if (mBottomSheet != null) {
             int colorId =
                     isIncognito() ? R.color.incognito_primary_color : R.color.default_primary_color;
             return ApiCompatibilityUtils.getColor(
                     ContextUtils.getApplicationContext().getResources(), colorId);
         }
         return mPrimaryColor;
     }
 
     @Override
     public boolean isUsingBrandColor() {
-        return mIsUsingBrandColor;
+        return mIsUsingBrandColor && mBottomSheet == null;
     }
 }