Add support for highlighting menu items

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.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.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
@@ skipping 2118 matching lines @@
             mToggleTabStackButton.setImageDrawable(mUseLightToolbarDrawables
                     ? mTabSwitcherButtonDrawableLight : mTabSwitcherButtonDrawable);
             if (mTabSwitcherAnimationTabStackDrawable != null) {
                 mTabSwitcherAnimationTabStackDrawable.setTint(
                         mUseLightToolbarDrawables ? mLightModeTint : mDarkModeTint);
             }
         }
 
         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);
 
         mLocationBar.updateVisualsForState();
         // Remove the side padding for incognito to ensure the badge icon aligns correctly with the
         // background of the location bar.
         if (isIncognito) {
             mLocationBar.setPadding(
                     0, mLocationBarBackgroundPadding.top, 0, mLocationBarBackgroundPadding.bottom);
@@ skipping 21 matching lines @@
 
         getMenuButtonWrapper().setVisibility(View.VISIBLE);
     }
 
     @Override
     public LocationBar getLocationBar() {
         return mLocationBar;
     }
 
     @Override
+    public void setMenuButtonHighlight(boolean highlight) {
+        super.setMenuButtonHighlight(highlight);

[Ted C, 2017/03/31 19:01:47]

doesn't super also call setAppMenuButtonHighlight?

Should this be:

if (mTabSwitcherState == STATIC_TAB) return;

At the beginning?

+
+        // 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();
 
         // Set up variables.
         if (!mBrowsingModeViews.contains(mMenuBadge)) {
             mBrowsingModeViews.add(mMenuBadge);
         }
 
         // Finish any in-progress animations and set the TabSwitcherAnimationMenuBadgeDrawables.
         finishAnimations();
@@ skipping 78 matching lines @@
         });
 
         if (mControlsVisibilityDelegate != null) {
             mFullscreenCalloutToken =
                     mControlsVisibilityDelegate.showControlsPersistentAndClearOldToken(
                             mFullscreenCalloutToken);
         }
     }
 }