From 02929745251ac23d2c5e7ddde2aac9a4ec96e21b Mon Sep 17 00:00:00 2001
From: openharmony_ci <120357966@qq.com>
Date: Sat, 9 Sep 2023 06:42:07 +0000
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!19303?=
 =?UTF-8?q?=20:=20=E4=BF=AE=E5=A4=8D=E6=A8=A1=E6=80=81=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=8BNavigation=E8=BF=94=E5=9B=9E=E5=BC=82=E5=B8=B8'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pattern/overlay/overlay_manager.cpp             | 13 -------------
 .../pipeline_ng/test/mock/mock_pipeline_base.cpp    |  5 -----
 2 files changed, 18 deletions(-)

diff --git a/frameworks/core/components_ng/pattern/overlay/overlay_manager.cpp b/frameworks/core/components_ng/pattern/overlay/overlay_manager.cpp
index abd3edee5f8..ab19c50b5a1 100644
--- a/frameworks/core/components_ng/pattern/overlay/overlay_manager.cpp
+++ b/frameworks/core/components_ng/pattern/overlay/overlay_manager.cpp
@@ -43,7 +43,6 @@
 #include "core/components_ng/pattern/menu/menu_layout_property.h"
 #include "core/components_ng/pattern/menu/menu_pattern.h"
 #include "core/components_ng/pattern/menu/wrapper/menu_wrapper_pattern.h"
-#include "core/components_ng/pattern/navrouter/navdestination_group_node.h"
 #include "core/components_ng/pattern/overlay/keyboard_base_pattern.h"
 #include "core/components_ng/pattern/overlay/keyboard_view.h"
 #include "core/components_ng/pattern/overlay/modal_presentation_pattern.h"
@@ -1088,18 +1087,6 @@ bool OverlayManager::RemoveOverlay(bool isBackPressed, bool isPageRouter)
         if (InstanceOf<MenuWrapperPattern>(pattern)) {
             return RemoveMenu(overlay);
         }
-        do {
-            auto pipeline = PipelineContext::GetCurrentContext();
-            CHECK_NULL_BREAK(pipeline);
-            auto navDestination = AceType::DynamicCast<NavDestinationGroupNode>(
-                pipeline->FindNavDestinationNodeToHandleBack(overlay));
-            CHECK_NULL_BREAK(navDestination);
-            auto backCallback = navDestination->GetNavDestinationBackButtonEvent();
-            CHECK_NULL_BREAK(backCallback);
-            GestureEvent gestureEvent;
-            backCallback(gestureEvent);
-            return true;
-        } while(0);
         if (!modalStack_.empty()) {
             if (isPageRouter) {
                 return RemoveAllModalInOverlay();
diff --git a/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp b/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp
index 5033b3a8df0..a5cc834972f 100644
--- a/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp
+++ b/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp
@@ -434,9 +434,4 @@ void PipelineBase::SetTextFieldManager(const RefPtr<ManagerInterface>& manager)
 {
     textFieldManager_ = manager;
 }
-
-RefPtr<NG::FrameNode> NG::PipelineContext::FindNavDestinationNodeToHandleBack(const RefPtr<NG::UINode>& node)
-{
-    return nullptr;
-}
 } // namespace OHOS::Ace
-- 
Gitee