Replace return button with close button on custom tab toolbar

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.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.toolbar;
 
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.os.Handler;
 import android.os.Looper;
@@ skipping 488 matching lines @@
             OnClickListener bookmarkClickHandler,
             OnClickListener customTabsBackClickHandler) {
         assert !mInitializedWithNative;
         mTabModelSelector = tabModelSelector;
 
         mToolbar.getLocationBar().updateVisualsForState();
         mToolbar.getLocationBar().setUrlToPageUrl();
         mToolbar.setOnTabSwitcherClickHandler(tabSwitcherClickHandler);
         mToolbar.setOnNewTabClickHandler(newTabClickHandler);
         mToolbar.setBookmarkClickHandler(bookmarkClickHandler);
-        mToolbar.setCustomTabReturnClickHandler(customTabsBackClickHandler);
+        mToolbar.setCustomTabCloseClickHandler(customTabsBackClickHandler);
 
         mToolbarModel.initializeWithNative();
 
         mToolbar.addOnAttachStateChangeListener(new OnAttachStateChangeListener() {
             @Override
             public void onViewDetachedFromWindow(View v) {
                 Context context = mToolbar.getContext();
                 HomepageManager.getInstance(context).removeListener(mHomepageStateListener);
                 mTabModelSelector.removeObserver(mTabModelSelectorObserver);
                 for (TabModel model : mTabModelSelector.getModels()) {
@@ skipping 270 matching lines @@
      */
     public void updatePrimaryColor(int color) {
         boolean colorChanged = mToolbarModel.getPrimaryColor() != color;
         if (!colorChanged) return;
 
         mToolbarModel.setPrimaryColor(color);
         mToolbar.onPrimaryColorChanged();
     }
 
     /**
+     * Sets the icon resource that the close button shows.
+     */
+    public void setCloseButtonIcon(int iconRes) {
+        mToolbar.setCloseButtonImageResource(iconRes);
+    }
+
+    /**
      * Sets whether a title should be shown within the Toolbar.
      * @param showTitle Whether a title should be shown.
      */
     public void setShowTitle(boolean showTitle) {
         mLocationBar.setShowTitle(showTitle);
     }
 
     /**
      * Focuses or unfocuses the URL bar.
      * @param focused Whether URL bar should be focused.
@@ skipping 251 matching lines @@
         }
 
         /**
          * Cancels simulating load progress.
          */
         public void cancel() {
             mHandler.removeMessages(MSG_ID_UPDATE_PROGRESS);
         }
     }
 }