From aea5e9586e9c6337f62fceba3672ccf6c6317661 Mon Sep 17 00:00:00 2001 From: Laurie Marceau Date: Tue, 4 Feb 2025 12:16:47 -0500 Subject: [PATCH] Fix conflicts --- .../Views/BrowserViewController.swift | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/firefox-ios/Client/Frontend/Browser/BrowserViewController/Views/BrowserViewController.swift b/firefox-ios/Client/Frontend/Browser/BrowserViewController/Views/BrowserViewController.swift index c6a0532194af..80aa79e1928b 100644 --- a/firefox-ios/Client/Frontend/Browser/BrowserViewController/Views/BrowserViewController.swift +++ b/firefox-ios/Client/Frontend/Browser/BrowserViewController/Views/BrowserViewController.swift @@ -85,10 +85,10 @@ class BrowserViewController: UIViewController, var themeManager: ThemeManager var notificationCenter: NotificationProtocol var themeObserver: NSObjectProtocol? - var logger: Logger // MARK: Optional UI elements + var topTabsViewController: TopTabsViewController? var tabTrayViewController: TabTrayController? var legacyUrlBar: URLBarView? @@ -216,12 +216,6 @@ class BrowserViewController: UIViewController, // MARK: Feature flags - var tabTrayViewController: TabTrayController? - - let profile: Profile - let tabManager: TabManager - let crashTracker: CrashTracker - let ratingPromptManager: RatingPromptManager var isToolbarRefactorEnabled: Bool { return featureFlags.isFeatureEnabled(.toolbarRefactor, checking: .buildOnly) } @@ -263,11 +257,12 @@ class BrowserViewController: UIViewController, // MARK: Data management - private var browserViewControllerState: BrowserViewControllerState? - var appAuthenticator: AppAuthenticationProtocol let profile: Profile let tabManager: TabManager + let crashTracker: CrashTracker let ratingPromptManager: RatingPromptManager + private var browserViewControllerState: BrowserViewControllerState? + var appAuthenticator: AppAuthenticationProtocol private var keyboardState: KeyboardState? // Tracking navigation items to record history types.