From 41d96be8b457ebfeb47b3432a7b51c6c97fccbe3 Mon Sep 17 00:00:00 2001
From: Nate Weaver <wevah@derailer.org>
Date: Thu, 21 May 2020 05:21:54 -0500
Subject: [PATCH] Revert toolbar item updating

---
 Mac/MainWindow/MainWindowController.swift     | 39 -------------------
 .../GeneralPrefencesViewController.swift      |  1 -
 Shared/AppNotifications.swift                 |  1 -
 3 files changed, 41 deletions(-)

diff --git a/Mac/MainWindow/MainWindowController.swift b/Mac/MainWindow/MainWindowController.swift
index 86f17178e..4d068daad 100644
--- a/Mac/MainWindow/MainWindowController.swift
+++ b/Mac/MainWindow/MainWindowController.swift
@@ -11,7 +11,6 @@ import UserNotifications
 import Articles
 import Account
 import RSCore
-import RSWeb
 
 enum TimelineSourceMode {
 	case regular, search
@@ -90,12 +89,8 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
 		NotificationCenter.default.addObserver(self, selector: #selector(unreadCountDidChange(_:)), name: .UnreadCountDidChange, object: nil)
 		NotificationCenter.default.addObserver(self, selector: #selector(displayNameDidChange(_:)), name: .DisplayNameDidChange, object: nil)
 
-		NotificationCenter.default.addObserver(self, selector: #selector(defaultBrowserDidChange(_:)), name: .DefaultBrowserDidChange, object: nil)
-		NotificationCenter.default.addObserver(self, selector: #selector(defaultBrowserDidChange(_:)), name: NSApplication.willBecomeActiveNotification, object: nil)
-
 		DispatchQueue.main.async {
 			self.updateWindowTitle()
-			self.updateOpenInBrowserToolbarItem()
 		}
 
 	}
@@ -173,40 +168,6 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
 		
 	}
 
-	func updateOpenInBrowserToolbarItem() {
-		guard let item = self.window?.toolbar?.items.first(where: { $0.action == #selector(openArticleInBrowser(_:)) }) else {
-			return
-		}
-
-		guard let button = item.view as? NSButton else { return }
-
-		var browserName = NSLocalizedString("Browser", comment: "Browser")
-		var icon = NSImage(named: "openInBrowser")!
-
-		var currentBrowser: MacWebBrowser?
-
-		if let browserID = AppDefaults.defaultBrowserID {
-			currentBrowser = MacWebBrowser(bundleIdentifier: browserID)
-		} else {
-			currentBrowser = MacWebBrowser.default
-		}
-
-		if let currentBrowser = currentBrowser {
-			icon = currentBrowser.icon!
-			icon.size = NSSize(width: 16.0, height: 16.0)
-			browserName = currentBrowser.name!
-		}
-
-		button.image = icon
-
-		let format = NSLocalizedString("Open in %@", comment: "Open in Browser toolbar item tooltip format")
-		item.toolTip = String(format: format, browserName)
-	}
-
-	@objc func defaultBrowserDidChange(_ note: Notification?) {
-		updateOpenInBrowserToolbarItem()
-	}
-	
 	// MARK: - Toolbar
 	
 	@objc func makeToolbarValidate() {
diff --git a/Mac/Preferences/General/GeneralPrefencesViewController.swift b/Mac/Preferences/General/GeneralPrefencesViewController.swift
index 5541816a6..9ea450cbb 100644
--- a/Mac/Preferences/General/GeneralPrefencesViewController.swift
+++ b/Mac/Preferences/General/GeneralPrefencesViewController.swift
@@ -56,7 +56,6 @@ final class GeneralPreferencesViewController: NSViewController {
 		}
 		let bundleID = menuItem.representedObject as? String
 		AppDefaults.defaultBrowserID = bundleID
-		NotificationCenter.default.post(name: .DefaultBrowserDidChange, object: nil)
 		updateUI()
 	}
 }
diff --git a/Shared/AppNotifications.swift b/Shared/AppNotifications.swift
index cb19cb560..84cfd9a72 100644
--- a/Shared/AppNotifications.swift
+++ b/Shared/AppNotifications.swift
@@ -12,7 +12,6 @@ import Articles
 extension Notification.Name {
 	static let InspectableObjectsDidChange = Notification.Name("TimelineSelectionDidChangeNotification")
 	static let UserDidAddFeed = Notification.Name("UserDidAddFeedNotification")
-	static let DefaultBrowserDidChange = Notification.Name("DefaultBrowserDidChangeNotification")
 
 	#if !MAC_APP_STORE
 		static let WebInspectorEnabledDidChange = Notification.Name("WebInspectorEnabledDidChange")