| Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java
|
| index 174da7e48d5c33041a5bae601eb19f65280b9270..535de6534da998ec36e33151d561b618be30bdd5 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java
|
| @@ -1813,7 +1813,16 @@ public class ToolbarPhone extends ToolbarLayout
|
| mTabSwitcherButtonDrawableLight.updateForTabCount(numberOfTabs, isIncognito());
|
| mTabSwitcherButtonDrawable.updateForTabCount(numberOfTabs, isIncognito());
|
|
|
| - boolean useTabStackDrawableLight = isIncognito();
|
| + int themeColor;
|
| + if (getToolbarDataProvider() != null) {
|
| + themeColor = getToolbarDataProvider().getPrimaryColor();
|
| + } else {
|
| + themeColor = getToolbarColorForVisualState(
|
| + isIncognito() ? VisualState.INCOGNITO : VisualState.NORMAL);
|
| + }
|
| +
|
| + boolean useTabStackDrawableLight = isIncognito()
|
| + || ColorUtils.shouldUseLightForegroundOnBackground(themeColor);
|
| if (mTabSwitcherAnimationTabStackDrawable == null
|
| || mIsOverlayTabStackDrawableLight != useTabStackDrawableLight) {
|
| mTabSwitcherAnimationTabStackDrawable =
|
|
|