Commit edcf4b33 authored by Shimi Zhang's avatar Shimi Zhang Committed by Commit Bot

Remove kEnhancedSelectionInsertionHandle flag.

Magnifier is in prod for a while, we don't need this feature to behind
a flag anymore.

Bug: 967056
Change-Id: I8697aaab5aacbca56693118498729b9bd1aa1768
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1654628Reviewed-by: default avatarBo <boliu@chromium.org>
Commit-Queue: Shimi Zhang <ctzsm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#668496}
parent 3f38f7f9
...@@ -23,7 +23,6 @@ namespace { ...@@ -23,7 +23,6 @@ namespace {
// in other locations in the code base (e.g. content_features.h). // in other locations in the code base (e.g. content_features.h).
const base::Feature* kFeaturesExposedToJava[] = { const base::Feature* kFeaturesExposedToJava[] = {
&features::kBackgroundMediaRendererHasModerateBinding, &features::kBackgroundMediaRendererHasModerateBinding,
&kEnhancedSelectionInsertionHandle,
&kServiceGroupImportance, &kServiceGroupImportance,
}; };
...@@ -40,8 +39,6 @@ const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) { ...@@ -40,8 +39,6 @@ const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) {
} // namespace } // namespace
// Alphabetical: // Alphabetical:
const base::Feature kEnhancedSelectionInsertionHandle{
"EnhancedSelectionInsertionHandle", base::FEATURE_ENABLED_BY_DEFAULT};
const base::Feature kRequestUnbufferedDispatch{ const base::Feature kRequestUnbufferedDispatch{
"RequestUnbufferedDispatch", base::FEATURE_ENABLED_BY_DEFAULT}; "RequestUnbufferedDispatch", base::FEATURE_ENABLED_BY_DEFAULT};
const base::Feature kServiceGroupImportance{"ServiceGroupImportance", const base::Feature kServiceGroupImportance{"ServiceGroupImportance",
......
...@@ -11,7 +11,6 @@ namespace content { ...@@ -11,7 +11,6 @@ namespace content {
namespace android { namespace android {
// Alphabetical: // Alphabetical:
extern const base::Feature kEnhancedSelectionInsertionHandle;
extern const base::Feature kRequestUnbufferedDispatch; extern const base::Feature kRequestUnbufferedDispatch;
extern const base::Feature kServiceGroupImportance; extern const base::Feature kServiceGroupImportance;
......
...@@ -121,10 +121,8 @@ std::unique_ptr<ui::TouchSelectionController> CreateSelectionController( ...@@ -121,10 +121,8 @@ std::unique_ptr<ui::TouchSelectionController> CreateSelectionController(
base::CommandLine::ForCurrentProcess()->HasSwitch( base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableLongpressDragSelection); switches::kEnableLongpressDragSelection);
config.hide_active_handle = config.hide_active_handle =
base::FeatureList::IsEnabled(
content::android::kEnhancedSelectionInsertionHandle) &&
base::android::BuildInfo::GetInstance()->sdk_int() >= base::android::BuildInfo::GetInstance()->sdk_int() >=
base::android::SDK_VERSION_P; base::android::SDK_VERSION_P;
return std::make_unique<ui::TouchSelectionController>(client, config); return std::make_unique<ui::TouchSelectionController>(client, config);
} }
......
...@@ -49,10 +49,7 @@ public class ContentClassFactory { ...@@ -49,10 +49,7 @@ public class ContentClassFactory {
*/ */
public SelectionInsertionHandleObserver createHandleObserver( public SelectionInsertionHandleObserver createHandleObserver(
SelectionPopupControllerImpl.ReadbackViewCallback callback) { SelectionPopupControllerImpl.ReadbackViewCallback callback) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) return null;
|| !ContentFeatureList.isEnabled(
ContentFeatureList.ENHANCED_SELECTION_INSERTION_HANDLE))
return null;
return new MagnifierAnimator(new MagnifierWrapperImpl(callback)); return new MagnifierAnimator(new MagnifierWrapperImpl(callback));
} }
......
...@@ -30,9 +30,6 @@ public abstract class ContentFeatureList { ...@@ -30,9 +30,6 @@ public abstract class ContentFeatureList {
} }
// Alphabetical: // Alphabetical:
public static final String ENHANCED_SELECTION_INSERTION_HANDLE =
"EnhancedSelectionInsertionHandle";
public static final String BACKGROUND_MEDIA_RENDERER_HAS_MODERATE_BINDING = public static final String BACKGROUND_MEDIA_RENDERER_HAS_MODERATE_BINDING =
"BackgroundMediaRendererHasModerateBinding"; "BackgroundMediaRendererHasModerateBinding";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment