Fixing CCT App Menu issues introduced by refactor

This CL undoes some of the changes that could impact CCT that was
introduced in the MenuButton refactor CL:
https://chromium-review.googlesource.com/c/chromium/src/+/1419203

Bug: 925271
Change-Id: Ifb9575f8cf52934981c12b1a6c5114993997cc5e
Reviewed-on: https://chromium-review.googlesource.com/c/1447834Reviewed-by: Theresa <twellington@chromium.org>
Commit-Queue: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#628296}

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

@@ -27,7 +27,6 @@ import org.chromium.chrome.browser.appmenu.AppMenuButtonHelper;
 import org.chromium.chrome.browser.omaha.UpdateMenuItemHelper;
 import org.chromium.chrome.browser.omaha.UpdateMenuItemHelper.MenuButtonState;
 import org.chromium.chrome.browser.widget.PulseDrawable;
-import org.chromium.ui.UiUtils;
 import org.chromium.ui.interpolators.BakedBezierInterpolator;
 
 /**
@@ -108,6 +107,10 @@ public class MenuButton extends FrameLayout implements TintObserver {
                 ApiCompatibilityUtils.getDrawable(getResources(), drawable));
     }
 
+    /**
+     * Show the update badge on the app menu button.
+     * @param animate Whether to animate the showing of the update badge.
+     */
     public void showAppMenuUpdateBadge(boolean animate) {
         if (mUpdateBadgeView == null) return;
         mShowMenuBadge = true;
@@ -116,6 +119,10 @@ public class MenuButton extends FrameLayout implements TintObserver {
         setAppMenuUpdateBadgeToVisible(animate);
     }
 
+    /**
+     * Remove the update badge on the app menu button.
+     * @param animate Whether to animate the hiding of the update badge.
+     */
     public void removeAppMenuUpdateBadge(boolean animate) {
         if (mUpdateBadgeView == null) return;
         boolean wasShowingMenuBadge = mShowMenuBadge;
@@ -264,7 +271,6 @@ public class MenuButton extends FrameLayout implements TintObserver {
             mThemeColorProvider.removeTintObserver(this);
             mThemeColorProvider = null;
         }
-        UiUtils.removeViewFromParent(this);
     }
 
     /**

chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/CustomTabToolbar.java

@@ -136,6 +136,7 @@ public class CustomTabToolbar
     private ImageButton mSecurityButton;
     private LinearLayout mCustomActionButtons;
     private ImageButton mCloseButton;
+    private ImageButton mMenuButton;
 
     // Whether dark tint should be applied to icons and text.
     private boolean mUseDarkColors = true;
@@ -183,6 +184,7 @@ public class CustomTabToolbar
         mCustomActionButtons = findViewById(R.id.action_buttons);
         mCloseButton = findViewById(R.id.close_button);
         mCloseButton.setOnLongClickListener(this);
+        mMenuButton = findViewById(R.id.menu_button);
         mAnimDelegate = new CustomTabToolbarAnimationDelegate(mSecurityButton, mTitleUrlContainer);
     }
 
@@ -782,6 +784,9 @@ public class CustomTabToolbar
     @Override
     public void setAutocompleteProfile(Profile profile) {}
 
+    @Override
+    void showAppMenuUpdateBadge(boolean animate) {}
+
     @Override
     boolean isShowingAppMenuUpdateBadge() {
         return false;
@@ -796,9 +801,15 @@ public class CustomTabToolbar
         return getMenuButton();
     }
 
+    @Override
+    ImageButton getMenuButton() {
+        return mMenuButton;
+    }
+
     @Override
     void disableMenuButton() {
         super.disableMenuButton();
+        mMenuButton = null;
         // In addition to removing the menu button, we also need to remove the margin on the custom
         // action button.
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {

chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java

@@ -111,6 +111,12 @@ public abstract class ToolbarLayout extends FrameLayout {
         mToolbarTabController = tabController;
         if (mMenuButtonWrapper != null) {
             mMenuButtonWrapper.setAppMenuButtonHelper(appMenuButtonHelper);
+        } else {
+            final ImageButton menuButton = getMenuButton();
+            if (menuButton != null) {
+                menuButton.setOnTouchListener(appMenuButtonHelper);
+                menuButton.setAccessibilityDelegate(appMenuButtonHelper);
+            }
         }
     }
 
@@ -139,6 +145,8 @@ public abstract class ToolbarLayout extends FrameLayout {
      * instance vars.
      */
     void disableMenuButton() {
+        UiUtils.removeViewFromParent(getMenuButtonWrapper());
+
         if (mMenuButtonWrapper != null) {
             mMenuButtonWrapper.destroy();
             mMenuButtonWrapper = null;