fixup! Bug 40016: Modify Default toolbar menu

Bug 40093: Enable Quit menu button

fixup! Bug 40016: Modify Default toolbar menu
Bug 40093: Enable Quit menu button
b30df1e9 · Matthew Finkel · 94888f5b · b30df1e9
Unverified Commit b30df1e9 authored Oct 20, 2020 by Matthew Finkel
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt ...rg/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt +1 -4

No files found.
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
@@ -175,16 +175,13 @@ class DefaultToolbarMenu(
        // Predicates that are called once, during screen init
        val shouldShowSaveToCollection = (context.asActivity() as? HomeActivity)
            ?.browsingModeManager?.mode == BrowsingMode.Normal
-        val shouldDeleteDataOnQuit = context.components.settings
-            .shouldDeleteBrowsingDataOnQuit &&
-            !context.components.settings.shouldDisableNormalMode

        val menuItems = listOfNotNull(
            downloadsItem,
            // historyItem,
            bookmarksItem,
            settings,
-            if (shouldDeleteDataOnQuit) deleteDataOnQuit else null,
+            deleteDataOnQuit,
            BrowserMenuDivider(),
            findInPage,
            addToTopSites,