Only remove menu button for duet in ToolbarPhone

FeatureUtilities#isBottomToolbarEnabled is agnostic to whether Chrome
is in an activity that supports Duet. This patch moves the logic for
whether to remove the menu button from the top toolbar to
ToolbarPhone, where Duet is always supported.

Bug: 865061
Change-Id: Icfceddf92d04722bb9e8d20266e671642c50033d
Reviewed-on: https://chromium-review.googlesource.com/1142137Reviewed-by: Ted Choc <tedchoc@chromium.org>
Commit-Queue: Matthew Jones <mdjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#576101}

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

@@ -41,7 +41,6 @@ import org.chromium.chrome.browser.omnibox.UrlBarData;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
-import org.chromium.chrome.browser.util.FeatureUtilities;
 import org.chromium.chrome.browser.util.ViewUtils;
 import org.chromium.chrome.browser.widget.PulseDrawable;
 import org.chromium.chrome.browser.widget.ScrimView;
@@ -149,6 +148,17 @@ public abstract class ToolbarLayout extends FrameLayout implements Toolbar {
                 getContext(), getProgressBarHeight(), getProgressBarTopMargin(), false);
     }
 
+    /**
+     * Disable the menu button. This removes the view from the hierarchy and nulls the related
+     * instance vars.
+     */
+    protected void disableMenuButton() {
+        UiUtils.removeViewFromParent(mMenuButtonWrapper);
+        mMenuButtonWrapper = null;
+        mMenuButton = null;
+        mMenuBadge = null;
+    }
+
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
@@ -156,12 +166,6 @@ public abstract class ToolbarLayout extends FrameLayout implements Toolbar {
         mMenuButton = (TintedImageButton) findViewById(R.id.menu_button);
         mMenuBadge = (ImageView) findViewById(R.id.menu_badge);
         mMenuButtonWrapper = findViewById(R.id.menu_button_wrapper);
-        if (FeatureUtilities.isBottomToolbarEnabled()) {
-            UiUtils.removeViewFromParent(mMenuButtonWrapper);
-            mMenuButtonWrapper = null;
-            mMenuButton = null;
-            mMenuBadge = null;
-        }
 
         // Initialize the provider to an empty version to avoid null checking everywhere.
         mToolbarDataProvider = new ToolbarDataProvider() {

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

@@ -383,9 +383,12 @@ public class ToolbarPhone extends ToolbarLayout
             mToolbarButtonsContainer = (ViewGroup) findViewById(R.id.toolbar_buttons);
 
             mHomeButton = (TintedImageButton) findViewById(R.id.home_button);
-            if (FeatureUtilities.isBottomToolbarEnabled() && mHomeButton != null) {
-                UiUtils.removeViewFromParent(mHomeButton);
-                mHomeButton = null;
+            if (FeatureUtilities.isBottomToolbarEnabled()) {
+                disableMenuButton();
+                if (mHomeButton != null) {
+                    UiUtils.removeViewFromParent(mHomeButton);
+                    mHomeButton = null;
+                }
             }
 
             mUrlBar = (TextView) findViewById(R.id.url_bar);