From 56f4174c02380ae37454b2419bdfd57c364ff353 Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Fri, 15 Mar 2019 15:10:13 -0700
Subject: [PATCH] Closes #1043 - Remove redundant CustomTabsToolbarFeature

---
 .../org/mozilla/fenix/browser/BrowserFragment.kt    | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
index 5c8cfd823..212f4e044 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -24,7 +24,6 @@ import kotlinx.android.synthetic.main.fragment_browser.view.*
 import mozilla.components.browser.toolbar.behavior.BrowserToolbarBottomBehavior
 import mozilla.components.feature.contextmenu.ContextMenuCandidate
 import mozilla.components.feature.contextmenu.ContextMenuFeature
-import mozilla.components.feature.customtabs.CustomTabsToolbarFeature
 import mozilla.components.feature.downloads.DownloadsFeature
 import mozilla.components.feature.prompts.PromptFeature
 import mozilla.components.feature.session.FullScreenFeature
@@ -63,7 +62,6 @@ class BrowserFragment : Fragment(), BackHandler {
     private val downloadsFeature = ViewBoundFeatureWrapper<DownloadsFeature>()
     private val promptsFeature = ViewBoundFeatureWrapper<PromptFeature>()
     private val findInPageIntegration = ViewBoundFeatureWrapper<FindInPageIntegration>()
-    private val customTabsToolbarFeature = ViewBoundFeatureWrapper<CustomTabsToolbarFeature>()
     private val toolbarIntegration = ViewBoundFeatureWrapper<ToolbarIntegration>()
     private val sitePermissionsFeature = ViewBoundFeatureWrapper<SitePermissionsFeature>()
     private val fullScreenFeature = ViewBoundFeatureWrapper<FullScreenFeature>()
@@ -168,15 +166,6 @@ class BrowserFragment : Fragment(), BackHandler {
             owner = this,
             view = view)
 
-        customTabsToolbarFeature.set(
-            feature = CustomTabsToolbarFeature(
-                sessionManager,
-                toolbarComponent.getView(),
-                sessionId,
-                closeListener = { requireActivity().finish() }),
-            owner = this,
-            view = view)
-
         toolbarIntegration.set(
             feature = (toolbarComponent.uiView as ToolbarUIView).toolbarIntegration,
             owner = this,
@@ -260,7 +249,7 @@ class BrowserFragment : Fragment(), BackHandler {
         return when {
             findInPageIntegration.onBackPressed() -> true
             sessionFeature.onBackPressed() -> true
-            customTabsToolbarFeature.onBackPressed() -> true
+            customTabsIntegration.onBackPressed() -> true
             else -> false
         }
     }