From 7f5f96b41beab8b611863e90cfad13a6ecebf1ba Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Tue, 23 Apr 2019 12:50:17 -0700
Subject: [PATCH] Closes #1914 - Removes incomplete actions from Custom Tab
 Menu

---
 .../fenix/components/toolbar/ToolbarUIView.kt     |  1 -
 .../fenix/customtabs/CustomTabToolbarMenu.kt      | 15 ---------------
 .../fenix/customtabs/CustomTabsIntegration.kt     |  6 ++----
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt
index 8783497f6..993b945de 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt
@@ -89,7 +89,6 @@ class ToolbarUIView(
 
             val menuToolbar = if (isCustom) {
                 CustomTabToolbarMenu(this,
-                    requestDesktopStateProvider = { session?.desktopMode ?: false },
                     onItemTapped = { actionEmitter.onNext(SearchAction.ToolbarMenuItemTapped(it)) }
                 )
             } else {
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 683922d84..e9da57610 100644
--- a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt
@@ -9,7 +9,6 @@ import mozilla.components.browser.menu.BrowserMenuBuilder
 import mozilla.components.browser.menu.item.BrowserMenuDivider
 import mozilla.components.browser.menu.item.BrowserMenuImageText
 import mozilla.components.browser.menu.item.BrowserMenuItemToolbar
-import mozilla.components.browser.menu.item.BrowserMenuSwitch
 import mozilla.components.browser.menu.item.SimpleBrowserMenuItem
 import org.mozilla.fenix.DefaultThemeManager
 import org.mozilla.fenix.R
@@ -18,7 +17,6 @@ import org.mozilla.fenix.ext.components
 
 class CustomTabToolbarMenu(
     private val context: Context,
-    private val requestDesktopStateProvider: () -> Boolean = { false },
     private val onItemTapped: (ToolbarMenu.Item) -> Unit = {}
 ) : ToolbarMenu {
     override val menuBuilder by lazy { BrowserMenuBuilder(menuItems) }
@@ -117,19 +115,6 @@ class CustomTabToolbarMenu(
                 onItemTapped.invoke(ToolbarMenu.Item.OpenInFenix)
             },
 
-            BrowserMenuImageText(
-                context.getString(R.string.browser_menu_find_in_page),
-                R.drawable.mozac_ic_search,
-                DefaultThemeManager.resolveAttribute(R.attr.primaryText, context)
-            ) {
-                onItemTapped.invoke(ToolbarMenu.Item.FindInPage)
-            },
-
-            BrowserMenuSwitch(context.getString(R.string.browser_menu_desktop_site),
-                requestDesktopStateProvider, { checked ->
-                    onItemTapped.invoke(ToolbarMenu.Item.RequestDesktop(checked))
-                }),
-
             BrowserMenuImageText(
                 context.getString(R.string.browser_menu_share),
                 R.drawable.mozac_ic_share,
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 ed74343fe..db85396e2 100644
--- a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt
+++ b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt
@@ -22,11 +22,9 @@ class CustomTabsIntegration(
     onItemTapped: (ToolbarMenu.Item) -> Unit = {}
 ) : LifecycleAwareFeature, BackHandler {
 
-    private val session = sessionManager.findSessionById(sessionId)
-
     private val customTabToolbarMenu by lazy {
-        CustomTabToolbarMenu(context,
-            requestDesktopStateProvider = { session?.desktopMode ?: false },
+        CustomTabToolbarMenu(
+            context,
             onItemTapped = onItemTapped
         )
     }