Replace update menu badge

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarTablet.java

Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarTablet.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarTablet.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarTablet.java
index d834def695084d2ab8c6574fd3e10c837caffb19..229c54a9c7d87f89b30cc6896f04c1d82a6094e5 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarTablet.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarTablet.java
@@ -269,6 +269,7 @@ public class ToolbarTablet extends ToolbarLayout implements OnClickListener {
             }
         } else if (mAccessibilitySwitcherButton == v) {
             if (mTabSwitcherListener != null) {
+                cancelAppMenuUpdateBadgeAnimation();
                 mTabSwitcherListener.onClick(mAccessibilitySwitcherButton);
             }
         }
@@ -305,6 +306,9 @@ public class ToolbarTablet extends ToolbarLayout implements OnClickListener {
             mAccessibilitySwitcherButton.setImageDrawable(
                     incognito ? mTabSwitcherButtonDrawableLight : mTabSwitcherButtonDrawable);
             mLocationBar.updateVisualsForState();
+            if (mShowMenuBadge) {
+                setAppMenuUpdateBadgeDrawable(incognito);
+            }
             mUseLightColorAssets = incognito;
         }
         mLocationBar.setUrlBarFocus(false);
@@ -364,15 +368,14 @@ public class ToolbarTablet extends ToolbarLayout implements OnClickListener {
             mForwardButton.setEnabled(false);
             mReloadButton.setEnabled(false);
             mLocationBar.getContainerView().setVisibility(View.INVISIBLE);
-            if (mShowMenuBadge && mUnbadgedMenuButtonDrawable != null) {
-                mMenuButton.setImageDrawable(mUnbadgedMenuButtonDrawable);
-                mMenuBadge.setVisibility(View.GONE);
+            if (mShowMenuBadge) {
+                mMenuBadge.setVisibility(View.INVISIBLE);

[gone, 2016/02/13 00:26:16]

Set back to GONE pretty please.

[Theresa, 2016/02/16 18:21:53]

Done.

             }
         } else {
             mIsInTabSwitcherMode = false;
             mLocationBar.getContainerView().setVisibility(View.VISIBLE);
             if (mShowMenuBadge) {
-                setAppMenuUpdateBadgeToVisible();
+                setAppMenuUpdateBadgeToVisible(false);
             }
         }
     }
@@ -417,7 +420,10 @@ public class ToolbarTablet extends ToolbarLayout implements OnClickListener {
     public void showAppMenuUpdateBadge() {
         super.showAppMenuUpdateBadge();
         if (!mIsInTabSwitcherMode) {
-            setAppMenuUpdateBadgeToVisible();
+            if (mUseLightColorAssets) {
+                setAppMenuUpdateBadgeDrawable(mUseLightColorAssets);
+            }
+            setAppMenuUpdateBadgeToVisible(true);
         }
     }
 }