From 55c1b01d7b6167645f3976d8c42e7db36f8a1ffd Mon Sep 17 00:00:00 2001
From: Tiger Oakes <toakes@mozilla.com>
Date: Fri, 10 Jan 2020 22:55:08 -0800
Subject: [PATCH] For #7431: Remove extra share button

---
 .../fenix/customtabs/CustomTabToolbarMenu.kt    | 14 ++------------
 .../fenix/customtabs/CustomTabsIntegration.kt   | 17 +++++------------
 2 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt
index 9aed183be..2af3ae449 100644
--- a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt
@@ -7,12 +7,12 @@ package org.mozilla.fenix.customtabs
 import android.content.Context
 import android.graphics.Typeface
 import mozilla.components.browser.menu.BrowserMenuBuilder
+import mozilla.components.browser.menu.item.BrowserMenuCategory
 import mozilla.components.browser.menu.item.BrowserMenuDivider
+import mozilla.components.browser.menu.item.BrowserMenuImageSwitch
 import mozilla.components.browser.menu.item.BrowserMenuImageText
 import mozilla.components.browser.menu.item.BrowserMenuItemToolbar
 import mozilla.components.browser.menu.item.SimpleBrowserMenuItem
-import mozilla.components.browser.menu.item.BrowserMenuImageSwitch
-import mozilla.components.browser.menu.item.BrowserMenuCategory
 import mozilla.components.browser.session.Session
 import mozilla.components.browser.session.SessionManager
 import org.mozilla.fenix.R
@@ -90,7 +90,6 @@ class CustomTabToolbarMenu(
         val menuItems = listOf(
             poweredBy,
             BrowserMenuDivider(),
-            share,
             desktopMode,
             findInPage,
             openInFenix,
@@ -100,15 +99,6 @@ class CustomTabToolbarMenu(
         if (shouldReverseItems) { menuItems.reversed() } else { menuItems }
     }
 
-    private val share = BrowserMenuImageText(
-        label = context.getString(R.string.browser_menu_share),
-        imageResource = R.drawable.mozac_ic_share,
-        textColorResource = primaryTextColor(),
-        iconTintColorResource = primaryTextColor()
-    ) {
-        onItemTapped.invoke(ToolbarMenu.Item.Share)
-    }
-
     private val desktopMode = BrowserMenuImageSwitch(
         imageResource = R.drawable.ic_desktop,
         label = context.getString(R.string.browser_menu_desktop_site),
diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt
index 79c8d0165..2293f717c 100644
--- a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt
+++ b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt
@@ -99,22 +99,15 @@ class CustomTabsIntegration(
         menuBuilder = customTabToolbarMenu.menuBuilder,
         menuItemIndex = START_OF_MENU_ITEMS_INDEX,
         window = activity.window,
+        shareListener = { onItemTapped.invoke(ToolbarMenu.Item.Share) },
         closeListener = { activity.finish() }
     )
 
-    override fun start() {
-        feature.start()
-    }
-
-    override fun stop() {
-        feature.stop()
-    }
-
-    override fun onBackPressed(): Boolean {
-        return feature.onBackPressed()
-    }
+    override fun start() = feature.start()
+    override fun stop() = feature.stop()
+    override fun onBackPressed() = feature.onBackPressed()
 
     companion object {
-        const val START_OF_MENU_ITEMS_INDEX = 2
+        private const val START_OF_MENU_ITEMS_INDEX = 2
     }
 }