From b0ad7c456efe09de8da5c439ebe0b36ffe35bffd Mon Sep 17 00:00:00 2001 From: Chris Bracken Date: Mon, 27 Mar 2023 18:35:00 -0700 Subject: [PATCH] [macOS] Eliminate explicit main window init() (#123571) [macOS] Eliminate explicit main window init() --- .../complex_layout/macos/Runner/MainFlutterWindow.swift | 2 +- .../macrobenchmarks/macos/Runner/MainFlutterWindow.swift | 2 +- .../channels/macos/Runner/MainFlutterWindow.swift | 2 +- .../flavors/macos/Runner/MainFlutterWindow.swift | 2 +- .../flutter_gallery/macos/Runner/MainFlutterWindow.swift | 2 +- dev/integration_tests/ui/macos/Runner/MainFlutterWindow.swift | 2 +- dev/manual_tests/macos/Runner/MainFlutterWindow.swift | 2 +- examples/api/macos/Runner/MainFlutterWindow.swift | 2 +- examples/hello_world/macos/Runner/MainFlutterWindow.swift | 2 +- examples/image_list/macos/Runner/MainFlutterWindow.swift | 2 +- examples/layers/macos/Runner/MainFlutterWindow.swift | 2 +- examples/platform_channel/macos/Runner/MainFlutterWindow.swift | 2 +- examples/platform_view/macos/Runner/MainFlutterWindow.swift | 2 +- .../app_shared/macos.tmpl/Runner/MainFlutterWindow.swift | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dev/benchmarks/complex_layout/macos/Runner/MainFlutterWindow.swift b/dev/benchmarks/complex_layout/macos/Runner/MainFlutterWindow.swift index a97a96274ee..a6a6b9af830 100644 --- a/dev/benchmarks/complex_layout/macos/Runner/MainFlutterWindow.swift +++ b/dev/benchmarks/complex_layout/macos/Runner/MainFlutterWindow.swift @@ -7,7 +7,7 @@ import FlutterMacOS class MainFlutterWindow: NSWindow { override func awakeFromNib() { - let flutterViewController = FlutterViewController.init() + let flutterViewController = FlutterViewController() let windowFrame = self.frame self.contentViewController = flutterViewController self.setFrame(windowFrame, display: true) diff --git a/dev/benchmarks/macrobenchmarks/macos/Runner/MainFlutterWindow.swift b/dev/benchmarks/macrobenchmarks/macos/Runner/MainFlutterWindow.swift index a97a96274ee..a6a6b9af830 100644 --- a/dev/benchmarks/macrobenchmarks/macos/Runner/MainFlutterWindow.swift +++ b/dev/benchmarks/macrobenchmarks/macos/Runner/MainFlutterWindow.swift @@ -7,7 +7,7 @@ import FlutterMacOS class MainFlutterWindow: NSWindow { override func awakeFromNib() { - let flutterViewController = FlutterViewController.init() + let flutterViewController = FlutterViewController() let windowFrame = self.frame self.contentViewController = flutterViewController self.setFrame(windowFrame, display: true) diff --git a/dev/integration_tests/channels/macos/Runner/MainFlutterWindow.swift b/dev/integration_tests/channels/macos/Runner/MainFlutterWindow.swift index b72f3c3bc45..f360c57e0e3 100644 --- a/dev/integration_tests/channels/macos/Runner/MainFlutterWindow.swift +++ b/dev/integration_tests/channels/macos/Runner/MainFlutterWindow.swift @@ -60,7 +60,7 @@ class ExtendedReaderWriter: FlutterStandardReaderWriter { class MainFlutterWindow: NSWindow { override func awakeFromNib() { - let flutterViewController = FlutterViewController.init() + let flutterViewController = FlutterViewController() let windowFrame = self.frame self.contentViewController = flutterViewController self.setFrame(windowFrame, display: true) diff --git a/dev/integration_tests/flavors/macos/Runner/MainFlutterWindow.swift b/dev/integration_tests/flavors/macos/Runner/MainFlutterWindow.swift index c8c554f4ac3..86450c67cea 100644 --- a/dev/integration_tests/flavors/macos/Runner/MainFlutterWindow.swift +++ b/dev/integration_tests/flavors/macos/Runner/MainFlutterWindow.swift @@ -7,7 +7,7 @@ import FlutterMacOS class MainFlutterWindow: NSWindow { override func awakeFromNib() { - let flutterViewController = FlutterViewController.init() + let flutterViewController = FlutterViewController() let windowFrame = self.frame self.contentViewController = flutterViewController self.setFrame(windowFrame, display: true) diff --git a/dev/integration_tests/flutter_gallery/macos/Runner/MainFlutterWindow.swift b/dev/integration_tests/flutter_gallery/macos/Runner/MainFlutterWindow.swift index a97a96274ee..a6a6b9af830 100644 --- a/dev/integration_tests/flutter_gallery/macos/Runner/MainFlutterWindow.swift +++ b/dev/integration_tests/flutter_gallery/macos/Runner/MainFlutterWindow.swift @@ -7,7 +7,7 @@ import FlutterMacOS class MainFlutterWindow: NSWindow { override func awakeFromNib() { - let flutterViewController = FlutterViewController.init() + let flutterViewController = FlutterViewController() let windowFrame = self.frame self.contentViewController = flutterViewController self.setFrame(windowFrame, display: true) diff --git a/dev/integration_tests/ui/macos/Runner/MainFlutterWindow.swift b/dev/integration_tests/ui/macos/Runner/MainFlutterWindow.swift index a52288a4c68..3f9f68507db 100644 --- a/dev/integration_tests/ui/macos/Runner/MainFlutterWindow.swift +++ b/dev/integration_tests/ui/macos/Runner/MainFlutterWindow.swift @@ -13,7 +13,7 @@ extension NSWindow { class MainFlutterWindow: NSWindow { override func awakeFromNib() { - let flutterViewController = FlutterViewController.init() + let flutterViewController = FlutterViewController() let windowFrame = self.frame self.contentViewController = flutterViewController self.setFrame(windowFrame, display: true) diff --git a/dev/manual_tests/macos/Runner/MainFlutterWindow.swift b/dev/manual_tests/macos/Runner/MainFlutterWindow.swift index a97a96274ee..a6a6b9af830 100644 --- a/dev/manual_tests/macos/Runner/MainFlutterWindow.swift +++ b/dev/manual_tests/macos/Runner/MainFlutterWindow.swift @@ -7,7 +7,7 @@ import FlutterMacOS class MainFlutterWindow: NSWindow { override func awakeFromNib() { - let flutterViewController = FlutterViewController.init() + let flutterViewController = FlutterViewController() let windowFrame = self.frame self.contentViewController = flutterViewController self.setFrame(windowFrame, display: true) diff --git a/examples/api/macos/Runner/MainFlutterWindow.swift b/examples/api/macos/Runner/MainFlutterWindow.swift index a97a96274ee..a6a6b9af830 100644 --- a/examples/api/macos/Runner/MainFlutterWindow.swift +++ b/examples/api/macos/Runner/MainFlutterWindow.swift @@ -7,7 +7,7 @@ import FlutterMacOS class MainFlutterWindow: NSWindow { override func awakeFromNib() { - let flutterViewController = FlutterViewController.init() + let flutterViewController = FlutterViewController() let windowFrame = self.frame self.contentViewController = flutterViewController self.setFrame(windowFrame, display: true) diff --git a/examples/hello_world/macos/Runner/MainFlutterWindow.swift b/examples/hello_world/macos/Runner/MainFlutterWindow.swift index a97a96274ee..a6a6b9af830 100644 --- a/examples/hello_world/macos/Runner/MainFlutterWindow.swift +++ b/examples/hello_world/macos/Runner/MainFlutterWindow.swift @@ -7,7 +7,7 @@ import FlutterMacOS class MainFlutterWindow: NSWindow { override func awakeFromNib() { - let flutterViewController = FlutterViewController.init() + let flutterViewController = FlutterViewController() let windowFrame = self.frame self.contentViewController = flutterViewController self.setFrame(windowFrame, display: true) diff --git a/examples/image_list/macos/Runner/MainFlutterWindow.swift b/examples/image_list/macos/Runner/MainFlutterWindow.swift index a97a96274ee..a6a6b9af830 100644 --- a/examples/image_list/macos/Runner/MainFlutterWindow.swift +++ b/examples/image_list/macos/Runner/MainFlutterWindow.swift @@ -7,7 +7,7 @@ import FlutterMacOS class MainFlutterWindow: NSWindow { override func awakeFromNib() { - let flutterViewController = FlutterViewController.init() + let flutterViewController = FlutterViewController() let windowFrame = self.frame self.contentViewController = flutterViewController self.setFrame(windowFrame, display: true) diff --git a/examples/layers/macos/Runner/MainFlutterWindow.swift b/examples/layers/macos/Runner/MainFlutterWindow.swift index a97a96274ee..a6a6b9af830 100644 --- a/examples/layers/macos/Runner/MainFlutterWindow.swift +++ b/examples/layers/macos/Runner/MainFlutterWindow.swift @@ -7,7 +7,7 @@ import FlutterMacOS class MainFlutterWindow: NSWindow { override func awakeFromNib() { - let flutterViewController = FlutterViewController.init() + let flutterViewController = FlutterViewController() let windowFrame = self.frame self.contentViewController = flutterViewController self.setFrame(windowFrame, display: true) diff --git a/examples/platform_channel/macos/Runner/MainFlutterWindow.swift b/examples/platform_channel/macos/Runner/MainFlutterWindow.swift index 140af973764..16df5f63358 100644 --- a/examples/platform_channel/macos/Runner/MainFlutterWindow.swift +++ b/examples/platform_channel/macos/Runner/MainFlutterWindow.swift @@ -11,7 +11,7 @@ class MainFlutterWindow: NSWindow, FlutterStreamHandler, PowerSourceStateChangeD private var eventSink: FlutterEventSink? override func awakeFromNib() { - let flutterViewController = FlutterViewController.init() + let flutterViewController = FlutterViewController() let windowFrame = self.frame self.contentViewController = flutterViewController self.setFrame(windowFrame, display: true) diff --git a/examples/platform_view/macos/Runner/MainFlutterWindow.swift b/examples/platform_view/macos/Runner/MainFlutterWindow.swift index 39d5e0e8918..e56d2ac9905 100644 --- a/examples/platform_view/macos/Runner/MainFlutterWindow.swift +++ b/examples/platform_view/macos/Runner/MainFlutterWindow.swift @@ -13,7 +13,7 @@ import FlutterMacOS */ class MainFlutterWindow: NSWindow { override func awakeFromNib() { - let flutterViewController = FlutterViewController.init() + let flutterViewController = FlutterViewController() let windowFrame = self.frame self.contentViewController = flutterViewController self.setFrame(windowFrame, display: true) diff --git a/packages/flutter_tools/templates/app_shared/macos.tmpl/Runner/MainFlutterWindow.swift b/packages/flutter_tools/templates/app_shared/macos.tmpl/Runner/MainFlutterWindow.swift index 2722837ec91..3cc05eb2349 100644 --- a/packages/flutter_tools/templates/app_shared/macos.tmpl/Runner/MainFlutterWindow.swift +++ b/packages/flutter_tools/templates/app_shared/macos.tmpl/Runner/MainFlutterWindow.swift @@ -3,7 +3,7 @@ import FlutterMacOS class MainFlutterWindow: NSWindow { override func awakeFromNib() { - let flutterViewController = FlutterViewController.init() + let flutterViewController = FlutterViewController() let windowFrame = self.frame self.contentViewController = flutterViewController self.setFrame(windowFrame, display: true)