[Custom Tabs] Implement Bottombar

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

Index: chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
index f06e3a61af860f9fb7d425d3c683fa548ca1a90b..fb28ce647eba99bbc42500eb68cb598047a5d7ef 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
@@ -371,13 +371,13 @@ public class CustomTabsConnection extends ICustomTabsService.Stub {
 
     @Override
     public boolean updateVisuals(final ICustomTabsCallback callback, Bundle bundle) {
+        // TODO(ianwen): add update logic here to support bundle list and bottom bar items.
         final Bundle actionButtonBundle = IntentUtils.safeGetBundle(bundle,
                 CustomTabsIntent.EXTRA_ACTION_BUTTON_BUNDLE);
         if (actionButtonBundle == null) return false;
 
-        final Bitmap bitmap = ActionButtonParams.tryParseBitmapFromBundle(mApplication,
-                actionButtonBundle);
-        final String description = ActionButtonParams
+        final Bitmap bitmap = CustomButtonParams.tryParseBitmapFromBundle(actionButtonBundle);
+        final String description = CustomButtonParams
                 .tryParseDescriptionFromBundle(actionButtonBundle);
         if (bitmap == null || description == null) return false;
 
@@ -385,7 +385,7 @@ public class CustomTabsConnection extends ICustomTabsService.Stub {
             return ThreadUtils.runOnUiThreadBlocking(new Callable<Boolean>() {
                 @Override
                 public Boolean call() throws Exception {
-                    return CustomTabActivity.updateActionButton(callback.asBinder(), bitmap,
+                    return CustomTabActivity.updateCustomButton(callback.asBinder(), 0, bitmap,
                             description);
                 }
             });