Fix Custom Action Bar for custom tabs on tablet

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

Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
index 16194fd395750377d75dc78e8deaa0fb0bf9b077..d12afea65e0a802ad4e01a480cb1bf26fbdaefbc 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
@@ -185,9 +185,6 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
                 // TODO(tedchoc): Add support for changing the color based on the brand color.
             }
         };
-        mContextualMenuBar = new ContextualMenuBar(activity, mActionBarDelegate);
-        mContextualMenuBar.setCustomSelectionActionModeCallback(
-                new CustomSelectionActionModeCallback());
 
         mToolbarModel = new ToolbarModelImpl();
         mControlContainer = controlContainer;
@@ -197,6 +194,11 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
 
         mToolbar.setPaintInvalidator(invalidator);
 
+        mContextualMenuBar = new ContextualMenuBar(activity, mActionBarDelegate);
+        mContextualMenuBar.setCustomSelectionActionModeCallback(
+                new CustomSelectionActionModeCallback());
+        mContextualMenuBar.setTabStripHeight(mToolbar.getTabStripHeight());
+
         MenuDelegatePhone menuDelegate = new MenuDelegatePhone() {
             @Override
             public void updateReloadButtonState(boolean isLoading) {