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 e6f19e12e8964b4f793c2dcf3a83fe2fca85c9fd..b02b8cc37c5920dd58b68d54a295a549b08a3ca8 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 |
@@ -2136,8 +2136,9 @@ public class ToolbarPhone extends ToolbarLayout |
mMenuButton.setTint(mUseLightToolbarDrawables ? mLightModeTint : mDarkModeTint); |
- if (mShowMenuBadge && inOrEnteringStaticTab) { |
- setAppMenuUpdateBadgeDrawable(mUseLightToolbarDrawables); |
+ if (inOrEnteringStaticTab) { |
+ setAppMenuButtonHighlight(mHighlightingMenu, mUseLightToolbarDrawables); |
+ if (mShowMenuBadge) setAppMenuUpdateBadgeDrawable(mUseLightToolbarDrawables); |
} |
ColorStateList tint = mUseLightToolbarDrawables ? mLightModeTint : mDarkModeTint; |
if (mIsHomeButtonEnabled) mHomeButton.setTint(tint); |
@@ -2179,6 +2180,16 @@ public class ToolbarPhone extends ToolbarLayout |
} |
@Override |
+ public void setMenuButtonHighlight(boolean highlight) { |
+ super.setMenuButtonHighlight(highlight); |
Ted C
2017/03/31 19:01:47
doesn't super also call setAppMenuButtonHighlight?
|
+ |
+ // TODO(dtrainor): Why is the badge only shown on light? |
Ted C
2017/03/31 19:01:47
I don't understand this TODO.
|
+ if (mTabSwitcherState == STATIC_TAB) { |
+ setAppMenuButtonHighlight(highlight, mUseLightToolbarDrawables); |
+ } |
+ } |
+ |
+ @Override |
public void showAppMenuUpdateBadge() { |
super.showAppMenuUpdateBadge(); |