[Custom Tabs]Unbreak buttons on bottom bar

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabBottomBarDelegate.java

Index: chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabBottomBarDelegate.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabBottomBarDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabBottomBarDelegate.java
index 0a00605e249cb9f920a7caec2e23c479cbf7eb23..4a0556df9eb3c5f7c707171a000d94cb4d7c3854 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabBottomBarDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabBottomBarDelegate.java
@@ -18,6 +18,7 @@ import android.view.ViewStub;
 import android.widget.FrameLayout;
 import android.widget.FrameLayout.LayoutParams;
 import android.widget.ImageButton;
+import android.widget.LinearLayout;
 import android.widget.RemoteViews;
 
 import org.chromium.base.Log;
@@ -70,8 +71,11 @@ class CustomTabBottomBarDelegate {
             mClickPendingIntent = mDataProvider.getRemoteViewsPendingIntent();
             showRemoteViews(remoteViews);
         } else {
-            getBottomBarView().setBackgroundColor(mDataProvider.getBottomBarColor());
             List<CustomButtonParams> items = mDataProvider.getCustomButtonsOnBottombar();
+            if (items.isEmpty()) return;
+            LinearLayout layout = new LinearLayout(mActivity);
+            layout.setId(R.id.custom_tab_bottom_bar_wrapper);
+            layout.setBackgroundColor(mDataProvider.getBottomBarColor());
             for (CustomButtonParams params : items) {
                 if (params.showOnToolbar()) continue;
                 final PendingIntent pendingIntent = params.getPendingIntent();
@@ -84,10 +88,10 @@ class CustomTabBottomBarDelegate {
                         }
                     };
                 }
-                ImageButton button = params.buildBottomBarButton(mActivity, getBottomBarView(),
-                        clickListener);
-                getBottomBarView().addView(button);
+                layout.addView(
+                        params.buildBottomBarButton(mActivity, getBottomBarView(), clickListener));
             }
+            getBottomBarView().addView(layout);
         }
     }