Remove HomeViewController

Client.xcodeproj/project.pbxproj

@@ -558,7 +558,6 @@
 		A1D8420420BC44F800BDAFF7 /* PopoverContentComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1D8420120BC44F800BDAFF7 /* PopoverContentComponent.swift */; };
 		A1F66A7320DD71C400303328 /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1F66A7220DD71C400303328 /* SettingsViewController.swift */; };
 		A1F66A8020DD87CA00303328 /* Static.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1F66A7F20DD87CA00303328 /* Static.framework */; };
-		A1FEEE0320BEE6BF00298DA2 /* HomeMenuController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1FEEE0220BEE6BF00298DA2 /* HomeMenuController.swift */; };
 		A1FEEE2020BF28D900298DA2 /* Then.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1FEEE1F20BF28D900298DA2 /* Then.swift */; };
 		A83E5AB71C1D993D0026D912 /* UIPasteboardExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A83E5AB61C1D993D0026D912 /* UIPasteboardExtensions.swift */; };
 		A83E5B1A1C1DA8BF0026D912 /* image.gif in Resources */ = {isa = PBXBuildFile; fileRef = A83E5B181C1DA8BF0026D912 /* image.gif */; };
@@ -1881,7 +1880,6 @@
 		A1D8420120BC44F800BDAFF7 /* PopoverContentComponent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PopoverContentComponent.swift; sourceTree = "<group>"; };
 		A1F66A7220DD71C400303328 /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = "<group>"; };
 		A1F66A7F20DD87CA00303328 /* Static.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Static.framework; path = Carthage/Build/iOS/Static.framework; sourceTree = "<group>"; };
-		A1FEEE0220BEE6BF00298DA2 /* HomeMenuController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeMenuController.swift; sourceTree = "<group>"; };
 		A1FEEE1F20BF28D900298DA2 /* Then.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Then.swift; path = ThirdParty/Then.swift; sourceTree = "<group>"; };
 		A83E5AB61C1D993D0026D912 /* UIPasteboardExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UIPasteboardExtensions.swift; path = Extensions/UIPasteboardExtensions.swift; sourceTree = "<group>"; };
 		A83E5B181C1DA8BF0026D912 /* image.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = image.gif; sourceTree = "<group>"; };
@@ -3431,7 +3429,6 @@
 		7BC7B4571C903A6A0046E9D2 /* Menu */ = {
 			isa = PBXGroup;
 			children = (
-				A1FEEE0220BEE6BF00298DA2 /* HomeMenuController.swift */,
 				A1AD4BCE20BF3E8C007A6EA1 /* BookmarksViewController.swift */,
 				A198E75020C701ED00334C11 /* HistoryViewController.swift */,
 				44331DBA22521013007E3E93 /* MenuViewController.swift */,
@@ -5636,7 +5633,6 @@
 				E4CD9E911A6897FB00318571 /* ReaderMode.swift in Sources */,
 				4422D42321BFCE9200BF1855 /* HttpsEverywhereStats.swift in Sources */,
 				27FD2CAD2146C31C00A5A779 /* AddToFavoritesActivity.swift in Sources */,
-				A1FEEE0320BEE6BF00298DA2 /* HomeMenuController.swift in Sources */,
 				4422D4E121BFFB7600BF1855 /* filter_block.cc in Sources */,
 				0A1E843D2190A57F0042F782 /* SyncSettingsTableViewController.swift in Sources */,
 				C615FAE5212AC5E000A8168C /* PrivacyProtectionProtocol.swift in Sources */,

Client/Frontend/Browser/BrowserViewController.swift

@@ -2831,35 +2831,48 @@ extension BrowserViewController: JSPromptAlertControllerDelegate {
     }
 }
 
-extension BrowserViewController: HomeMenuControllerDelegate {
+extension BrowserViewController: ToolbarUrlActionsDelegate {
+    /// The types of actions a user can do in the menu given a URL
+    private enum ToolbarURLAction {
+        case openInCurrentTab
+        case openInNewTab(isPrivate: Bool)
+        case copy
+        case share
+    }
 
-    func menuDidOpenSettings(_ menu: UIViewController) {
-        menu.dismiss(animated: true) { [weak self] in
-            guard let `self` = self else { return }
-            let settingsController = SettingsViewController(profile: self.profile, tabManager: self.tabManager)
-            settingsController.settingsDelegate = self
-            let container = SettingsNavigationController(rootViewController: settingsController)
-            container.modalPresentationStyle = .formSheet
-            self.present(container, animated: true)
-        }
+    func openInNewTab(_ url: URL, isPrivate: Bool) {
+        select(url, visitType: .unknown, action: .openInNewTab(isPrivate: isPrivate))
+    }
+
+    func copy(_ url: URL) {
+        select(url, visitType: .unknown, action: .copy)
+    }
+
+    func share(_ url: URL) {
+        select(url, visitType: .unknown, action: .share)
     }
 
-    func menuDidSelectURL(_ menu: UIViewController, url: URL, visitType: VisitType, action: MenuURLAction) {
+    func batchOpen(_ urls: [URL]) {
+        let tabIsPrivate = TabType.of(tabManager.selectedTab).isPrivate
+        self.tabManager.addTabsForURLs(urls, zombie: false, isPrivate: tabIsPrivate)
+    }
+
+    func select(url: URL, visitType: VisitType) {
+        select(url, visitType: visitType, action: .openInCurrentTab)
+    }
+
+    private func select(_ url: URL, visitType: VisitType, action: ToolbarURLAction) {
         switch action {
         case .openInCurrentTab:
-            //menu.dismiss(animated: true)
             finishEditingAndSubmit(url, visitType: visitType)
-
         case .openInNewTab(let isPrivate):
-            //menu.dismiss(animated: true)
-            
-            let tab = self.tabManager.addTab(PrivilegedRequest(url: url) as URLRequest, afterTab: self.tabManager.selectedTab, isPrivate: isPrivate)
+            let tab = tabManager.addTab(PrivilegedRequest(url: url) as URLRequest, afterTab: tabManager.selectedTab, isPrivate: isPrivate)
             if isPrivate && !PrivateBrowsingManager.shared.isPrivateBrowsing {
-                self.tabManager.selectTab(tab)
+                tabManager.selectTab(tab)
             } else {
                 // If we are showing toptabs a user can just use the top tab bar
                 // If in overlay mode switching doesnt correctly dismiss the homepanels
-                guard !self.urlBar.inOverlayMode else {
+                guard !urlBar.inOverlayMode else {
                     return
                 }
                 // We're not showing the top tabs; show a toast to quick switch to the fresh new tab.
@@ -2868,48 +2881,19 @@ extension BrowserViewController: HomeMenuControllerDelegate {
                         self.tabManager.selectTab(tab)
                     }
                 })
-                self.show(toast: toast)
+                show(toast: toast)
             }
-
         case .copy:
             UIPasteboard.general.url = url
         case .share:
             presentActivityViewController(
                 url,
-                sourceView: self.view,
-                sourceRect: self.view.convert(self.urlBar.shareButton.frame, from: self.urlBar.shareButton.superview),
+                sourceView: view,
+                sourceRect: view.convert(urlBar.shareButton.frame, from: urlBar.shareButton.superview),
                 arrowDirection: [.up]
             )
         }
     }
-
-    func menuDidBatchOpenURLs(_ menu: UIViewController, urls: [URL]) {
-        let tabIsPrivate = TabType.of(tabManager.selectedTab).isPrivate
-        self.tabManager.addTabsForURLs(urls, zombie: false, isPrivate: tabIsPrivate)
-    }
-}
-
-extension BrowserViewController: ToolbarUrlActionsDelegate {
-
-    func openInNewTab(_ url: URL, isPrivate: Bool) {
-        menuDidSelectURL(self, url: url, visitType: .unknown, action: .openInNewTab(isPrivate: isPrivate))
-    }
-
-    func copy(_ url: URL) {
-        menuDidSelectURL(self, url: url, visitType: .unknown, action: .copy)
-    }
-
-    func share(_ url: URL) {
-        menuDidSelectURL(self, url: url, visitType: .unknown, action: .share)
-    }
-
-    func batchOpen(_ urls: [URL]) {
-        menuDidBatchOpenURLs(self, urls: urls)
-    }
-
-    func select(url: URL, visitType: VisitType) {
-        menuDidSelectURL(self, url: url, visitType: visitType, action: .openInCurrentTab)
-    }
 }
 
 extension BrowserViewController: TopSitesDelegate {