diff --git a/shell/common/platform_view.h b/shell/common/platform_view.h index a67b4b793cc..d5527b2bc06 100644 --- a/shell/common/platform_view.h +++ b/shell/common/platform_view.h @@ -210,25 +210,6 @@ class PlatformView { /// virtual void OnPlatformViewMarkTextureFrameAvailable( int64_t texture_id) = 0; - - //-------------------------------------------------------------------------- - /// @brief Directly invokes platform-specific APIs to compute the - /// locale the platform would have natively resolved to. - /// - /// @param[in] supported_locale_data The vector of strings that represents - /// the locales supported by the app. - /// Each locale consists of three - /// strings: languageCode, countryCode, - /// and scriptCode in that order. - /// - /// @return A vector of 3 strings languageCode, countryCode, and - /// scriptCode that represents the locale selected by the - /// platform. Empty strings mean the value was unassigned. Empty - /// vector represents a null locale. - /// - virtual std::unique_ptr> - ComputePlatformViewResolvedLocale( - const std::vector& supported_locale_data) = 0; }; //---------------------------------------------------------------------------- diff --git a/shell/common/shell.cc b/shell/common/shell.cc index 0f470cff37c..2a21ef7ee12 100644 --- a/shell/common/shell.cc +++ b/shell/common/shell.cc @@ -1178,13 +1178,6 @@ void Shell::SetNeedsReportTimings(bool value) { // |Engine::Delegate| std::unique_ptr> Shell::ComputePlatformResolvedLocale( const std::vector& supported_locale_data) { - return ComputePlatformViewResolvedLocale(supported_locale_data); -} - -// |PlatformView::Delegate| -std::unique_ptr> -Shell::ComputePlatformViewResolvedLocale( - const std::vector& supported_locale_data) { return platform_view_->ComputePlatformResolvedLocales(supported_locale_data); } diff --git a/shell/common/shell.h b/shell/common/shell.h index 8e8fd18b48b..89fee66841a 100644 --- a/shell/common/shell.h +++ b/shell/common/shell.h @@ -507,10 +507,6 @@ class Shell final : public PlatformView::Delegate, // |PlatformView::Delegate| void OnPlatformViewSetNextFrameCallback(const fml::closure& closure) override; - // |PlatformView::Delegate| - std::unique_ptr> ComputePlatformViewResolvedLocale( - const std::vector& supported_locale_data) override; - // |Animator::Delegate| void OnAnimatorBeginFrame(fml::TimePoint frame_target_time) override; diff --git a/shell/platform/darwin/ios/framework/Source/FlutterEnginePlatformViewTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterEnginePlatformViewTest.mm index 3e002e2aa78..7f081b9c587 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterEnginePlatformViewTest.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterEnginePlatformViewTest.mm @@ -33,12 +33,6 @@ class MockDelegate : public PlatformView::Delegate { void OnPlatformViewRegisterTexture(std::shared_ptr texture) override {} void OnPlatformViewUnregisterTexture(int64_t texture_id) override {} void OnPlatformViewMarkTextureFrameAvailable(int64_t texture_id) override {} - - std::unique_ptr> ComputePlatformViewResolvedLocale( - const std::vector& supported_locale_data) override { - std::unique_ptr> out = std::make_unique>(); - return out; - } }; } // namespace diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm index b71b603bc37..6f878ccb3dc 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm @@ -89,12 +89,6 @@ class FlutterPlatformViewsTestMockPlatformViewDelegate : public PlatformView::De void OnPlatformViewRegisterTexture(std::shared_ptr texture) override {} void OnPlatformViewUnregisterTexture(int64_t texture_id) override {} void OnPlatformViewMarkTextureFrameAvailable(int64_t texture_id) override {} - - std::unique_ptr> ComputePlatformViewResolvedLocale( - const std::vector& supported_locale_data) override { - std::unique_ptr> out = std::make_unique>(); - return out; - } }; } // namespace diff --git a/shell/platform/darwin/ios/framework/Source/accessibility_bridge_test.mm b/shell/platform/darwin/ios/framework/Source/accessibility_bridge_test.mm index 7596578bd5e..9edb7f08324 100644 --- a/shell/platform/darwin/ios/framework/Source/accessibility_bridge_test.mm +++ b/shell/platform/darwin/ios/framework/Source/accessibility_bridge_test.mm @@ -86,12 +86,6 @@ class MockDelegate : public PlatformView::Delegate { void OnPlatformViewRegisterTexture(std::shared_ptr texture) override {} void OnPlatformViewUnregisterTexture(int64_t texture_id) override {} void OnPlatformViewMarkTextureFrameAvailable(int64_t texture_id) override {} - - std::unique_ptr> ComputePlatformViewResolvedLocale( - const std::vector& supported_locale_data) override { - std::unique_ptr> out = std::make_unique>(); - return out; - } }; class MockIosDelegate : public AccessibilityBridge::IosDelegate {