Fix to bottom bar behavior

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.customtabs;
 
+import android.app.PendingIntent;
+import android.app.PendingIntent.CanceledException;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.IBinder;
 import android.support.customtabs.CustomTabsCallback;
 import android.support.customtabs.CustomTabsIntent;
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.MenuItem;
 import android.view.View;
@@ skipping 458 matching lines @@
         ViewGroup bottomBar = (ViewGroup) findViewById(R.id.bottombar);
         ImageButton button = (ImageButton) bottomBar.findViewById(params.getId());
         button.setContentDescription(params.getDescription());
         button.setImageDrawable(params.getIcon(getResources()));
     }
 
     /**
      * Inflates the bottom bar {@link ViewStub} and its shadow, and populates it with items.
      */
     private void showBottomBarIfNecessary() {
+        // TODO (yusufo): Find a better place for the layout code here and in CustomButtonParams.
         // TODO (ianwen): if button icon is too wide, show them in overflow menu instead. If button
         // id is not specified, the overflow sequence should be toolbar -> bottom bar -> menu.
         if (!mIntentDataProvider.shouldShowBottomBar()) return;
 
         ViewStub bottomBarStub = ((ViewStub) findViewById(R.id.bottombar_stub));
         bottomBarStub.setLayoutResource(R.layout.custom_tabs_bottombar);
         bottomBarStub.inflate();
 
         // Unlike others, this shadow docks itself at bottom and casts graphics upwards.
         FadingShadowView shadow = (FadingShadowView) findViewById(R.id.bottombar_shadow);
         shadow.setVisibility(View.VISIBLE);
         shadow.init(ApiCompatibilityUtils.getColor(getResources(),
                 R.color.bottom_bar_shadow_color), FadingShadow.POSITION_BOTTOM);
 
         ViewGroup bottomBar = (ViewGroup) findViewById(R.id.bottombar);
         bottomBar.setBackgroundColor(mIntentDataProvider.getToolbarColor());
         List<CustomButtonParams> items = mIntentDataProvider.getCustomButtonsOnBottombar();
         for (CustomButtonParams params : items) {
             if (params.showOnToolbar()) continue;
-            ImageButton button = params.buildBottomBarButton(this, bottomBar);
+            final PendingIntent pendingIntent = params.getPendingIntent();
+            OnClickListener clickListener = null;
+            if (pendingIntent != null) {
+                clickListener = new OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        Intent addedIntent = new Intent();
+                        addedIntent.setData(Uri.parse(getActivityTab().getUrl()));
+                        try {
+                            pendingIntent.send(CustomTabActivity.this, 0, addedIntent, null, null);
+                        } catch (CanceledException e) {
+                            Log.e(TAG,
+                                    "CanceledException while sending pending intent in custom tab");
+                        }
+                    }
+                };
+            }
+            ImageButton button = params.buildBottomBarButton(this, bottomBar, clickListener);
             bottomBar.addView(button);
         }
     }
 
     @Override
     public boolean shouldShowAppMenu() {
         return getActivityTab() != null && getToolbarManager().isInitialized();
     }
 
     @Override
@@ skipping 84 matching lines @@
 
     /**
      * @return The {@link CustomTabIntentDataProvider} for this {@link CustomTabActivity}. For test
      *         purposes only.
      */
     @VisibleForTesting
     CustomTabIntentDataProvider getIntentDataProvider() {
         return mIntentDataProvider;
     }
 }