From e4bb70e402613f8d09c42e87938473d00d71e60f Mon Sep 17 00:00:00 2001
From: tengfan66 <tengfan3@huawei.com>
Date: Tue, 31 Dec 2024 09:28:36 +0800
Subject: [PATCH] remove force

Signed-off-by: tengfan66 <tengfan3@huawei.com>
Change-Id: Ia632b12ae81f09f87b017754c8b23831c85bda29
---
 base/feature_list.cc                     | 12 +-----------
 ui/native_theme/native_theme_features.cc | 16 ----------------
 ui/native_theme/native_theme_features.h  |  6 ------
 3 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/base/feature_list.cc b/base/feature_list.cc
index afcc86ddc8..50142e5fa1 100644
--- a/base/feature_list.cc
+++ b/base/feature_list.cc
@@ -520,7 +520,6 @@ void FeatureList::SetScrollbarEnable(bool enable) {
     }
     LOG(INFO) << "set Scrollbar:" << enable << " state:" << state;
     g_feature_list_instance->SetOverrideStateByFeatureName("OverlayScrollbar", state);
-    g_feature_list_instance->SetOverrideStateByFeatureName("ForceScrollbar", state);
   } else {
     LOG(ERROR) << "set Scrollbar error";
   }
@@ -709,16 +708,7 @@ void FeatureList::FinalizeInitialization() {
 
 bool FeatureList::IsFeatureEnabled(const Feature& feature) const {
   OverrideState overridden_state = GetOverrideState(feature);
-#if defined(OHOS_SCROLLBAR)
-  if (std::string(feature.name) == "OverlayScrollbar") {
-    LOG(DEBUG) << "Overlay Scrollbar:" << overridden_state << " : " << (overridden_state == OVERRIDE_ENABLE_FEATURE);
-    // OverlayScrollbar using native process.
-  }
-  if (std::string(feature.name) == "ForceScrollbar") {
-    LOG(DEBUG) << "Force Scrollbar:" << overridden_state << " : " << (overridden_state == OVERRIDE_DISABLE_FEATURE);
-    return overridden_state == OVERRIDE_DISABLE_FEATURE;
-  }
-#endif
+
   // If marked as OVERRIDE_USE_DEFAULT, simply return the default state below.
   if (overridden_state != OVERRIDE_USE_DEFAULT)
     return overridden_state == OVERRIDE_ENABLE_FEATURE;
diff --git a/ui/native_theme/native_theme_features.cc b/ui/native_theme/native_theme_features.cc
index 5324d8a330..6edab5fcfe 100644
--- a/ui/native_theme/native_theme_features.cc
+++ b/ui/native_theme/native_theme_features.cc
@@ -19,10 +19,6 @@ constexpr base::FeatureState kOverlayScrollbarFeatureState =
     base::FEATURE_DISABLED_BY_DEFAULT;
 #endif
 
-#if defined(OHOS_SCROLLBAR)
-constexpr base::FeatureState kForceScrollbarFeatureState =
-    base::FEATURE_DISABLED_BY_DEFAULT;
-#endif
 // Enables or disables overlay scrollbars in Blink (i.e. web content) on Aura
 // or Linux.  The status of native UI overlay scrollbars is determined in
 // PlatformStyle::CreateScrollBar. Does nothing on Mac.
@@ -30,12 +26,6 @@ BASE_FEATURE(kOverlayScrollbar,
              "OverlayScrollbar",
              kOverlayScrollbarFeatureState);
 
-#if defined(OHOS_SCROLLBAR)
-BASE_FEATURE(kForceScrollbar,
-             "ForceScrollbar",
-             kForceScrollbarFeatureState);
-#endif
-
 // Fluent scrollbars aim to modernize the Chromium scrollbars (both overlay
 // and non-overlay) to fit the Windows 11 Fluent design language. For now,
 // the feature will only support Windows platform and can be later available
@@ -53,12 +43,6 @@ bool IsOverlayScrollbarEnabled() {
   return base::FeatureList::IsEnabled(features::kOverlayScrollbar);
 }
 
-#if defined(OHOS_SCROLLBAR)
-bool IsForceScrollbarEnabled() {
-  return base::FeatureList::IsEnabled(features::kForceScrollbar);
-}
-#endif
-
 bool IsFluentScrollbarEnabled() {
 // Currently, the feature is only supported on Windows. Please see more details
 // here: https://crbug.com/1353432.
diff --git a/ui/native_theme/native_theme_features.h b/ui/native_theme/native_theme_features.h
index ab8126c6a2..6bdc9c56e4 100644
--- a/ui/native_theme/native_theme_features.h
+++ b/ui/native_theme/native_theme_features.h
@@ -14,9 +14,6 @@ namespace features {
 
 NATIVE_THEME_EXPORT BASE_DECLARE_FEATURE(kOverlayScrollbar);
 NATIVE_THEME_EXPORT BASE_DECLARE_FEATURE(kFluentScrollbar);
-#if defined(OHOS_SCROLLBAR)
-NATIVE_THEME_EXPORT BASE_DECLARE_FEATURE(kForceScrollbar);
-#endif
 
 }  // namespace features
 
@@ -24,9 +21,6 @@ namespace ui {
 
 NATIVE_THEME_EXPORT bool IsOverlayScrollbarEnabled();
 NATIVE_THEME_EXPORT bool IsFluentScrollbarEnabled();
-#if defined(OHOS_SCROLLBAR)
-NATIVE_THEME_EXPORT bool IsForceScrollbarEnabled();
-#endif
 
 }  // namespace ui
 
-- 
Gitee