From b577bc4b425d44d47d92e97f271dcdc9ce40c81a Mon Sep 17 00:00:00 2001
From: Sawyer Blatz <sdblatz@gmail.com>
Date: Fri, 26 Apr 2019 11:35:27 -0700
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/2074: Displays title only in
 custom tabs (https://github.com/mozilla-mobile/fenix/pull/2075)

---
 .../mozilla/fenix/browser/BrowserFragment.kt  | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 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 bc2dd24d76..ed9d4876ac 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -279,18 +279,20 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope,
 
         val actionEmitter = ActionBusFactory.get(this).getManagedEmitter(SearchAction::class.java)
 
-        externalSessionId?.let {
-            customTabsIntegration.set(
-                feature = CustomTabsIntegration(
-                    requireContext(),
-                    requireComponents.core.sessionManager,
-                    toolbar,
-                    it,
-                    activity,
-                    onItemTapped = { actionEmitter.onNext(SearchAction.ToolbarMenuItemTapped(it)) }
-                ),
-                owner = this,
-                view = view)
+        if (getSessionById()?.isCustomTabSession() == true) {
+            externalSessionId?.let {
+                customTabsIntegration.set(
+                    feature = CustomTabsIntegration(
+                        requireContext(),
+                        requireComponents.core.sessionManager,
+                        toolbar,
+                        it,
+                        activity,
+                        onItemTapped = { actionEmitter.onNext(SearchAction.ToolbarMenuItemTapped(it)) }
+                    ),
+                    owner = this,
+                    view = view)
+            }
         }
 
         toolbarComponent.getView().setOnSiteSecurityClickedListener {