Move touch text editing redesign flag from ash to ui base features.
Move the touch text editing redesign flag from ash_features to
ui_base_features and change some flag checks to IS_CHROMEOS instead of
IS_CHROMEOS_ASH.
Bug: b:244116654
Change-Id: Ie9d24273648df851515bfab7b779a0a98f7cb193
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4082468
Commit-Queue: Michelle Chen <[email protected]>
Reviewed-by: Darren Shen <[email protected]>
Reviewed-by: Tommy Li <[email protected]>
Reviewed-by: Robert Kroeger <[email protected]>
Reviewed-by: Mitsuru Oshima <[email protected]>
Reviewed-by: Peter Boström <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1083566}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index d9e0275..ebcde377 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -4920,10 +4920,6 @@
flag_descriptions::kSystemJapanesePhysicalTypingName,
flag_descriptions::kSystemJapanesePhysicalTypingDescription, kOsCrOS,
FEATURE_VALUE_TYPE(ash::features::kSystemJapanesePhysicalTyping)},
- {"enable-cros-touch-text-editing-redesign",
- flag_descriptions::kTouchTextEditingRedesignName,
- flag_descriptions::kTouchTextEditingRedesignDescription, kOsCrOS,
- FEATURE_VALUE_TYPE(ash::features::kTouchTextEditingRedesign)},
{"enable-cros-virtual-keyboard-multitouch",
flag_descriptions::kVirtualKeyboardMultitouchName,
flag_descriptions::kVirtualKeyboardMultitouchDescription, kOsCrOS,
@@ -4990,6 +4986,13 @@
flag_descriptions::kSystemProxyForSystemServicesDescription, kOsCrOS,
FEATURE_VALUE_TYPE(ash::features::kSystemProxyForSystemServices)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS)
+ {"enable-cros-touch-text-editing-redesign",
+ flag_descriptions::kTouchTextEditingRedesignName,
+ flag_descriptions::kTouchTextEditingRedesignDescription,
+ kOsCrOS | kOsLacros,
+ FEATURE_VALUE_TYPE(features::kTouchTextEditingRedesign)},
+#endif // BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_MAC)
{"enable-immersive-fullscreen-toolbar",
flag_descriptions::kImmersiveFullscreenName,
diff --git a/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.cc b/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.cc
index 7a00be8..a9c3e95 100644
--- a/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.cc
+++ b/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.cc
@@ -571,9 +571,6 @@
"darkmode",
base::FeatureList::IsEnabled(chromeos::features::kDarkLightMode)));
features.Append(GenerateFeatureFlag(
- "touchtexteditingredesign",
- base::FeatureList::IsEnabled(ash::features::kTouchTextEditingRedesign)));
- features.Append(GenerateFeatureFlag(
"newheader",
base::FeatureList::IsEnabled(ash::features::kVirtualKeyboardNewHeader)));
features.Append(GenerateFeatureFlag(
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index d0bec37..68b4a1d 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -5985,10 +5985,6 @@
"If enabled, the user can calibrate the touch screen displays in "
"chrome://settings/display.";
-const char kTouchTextEditingRedesignName[] = "Touch Text Editing Redesign";
-const char kTouchTextEditingRedesignDescription[] =
- "Enables new touch text editing features.";
-
const char kTrafficCountersEnabledName[] = "Traffic counters enabled";
const char kTrafficCountersEnabledDescription[] =
"If enabled, data usage will be visible in the Cellular Settings UI and "
@@ -6268,6 +6264,10 @@
"Sync passphrase sharing";
const char kSyncChromeOSExplicitPassphraseSharingDescription[] =
"Allows sharing custom sync passphrase between OS and Browser on ChromeOS";
+
+const char kTouchTextEditingRedesignName[] = "Touch Text Editing Redesign";
+const char kTouchTextEditingRedesignDescription[] =
+ "Enables new touch text editing features.";
#endif // BUILDFLAG(IS_CHROMEOS)
#if defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS)
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index bdb57fe..2b20adb9 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -3447,9 +3447,6 @@
extern const char kTouchscreenCalibrationName[];
extern const char kTouchscreenCalibrationDescription[];
-extern const char kTouchTextEditingRedesignName[];
-extern const char kTouchTextEditingRedesignDescription[];
-
extern const char kTrafficCountersEnabledName[];
extern const char kTrafficCountersEnabledDescription[];
@@ -3615,6 +3612,9 @@
extern const char kSyncChromeOSExplicitPassphraseSharingName[];
extern const char kSyncChromeOSExplicitPassphraseSharingDescription[];
+
+extern const char kTouchTextEditingRedesignName[];
+extern const char kTouchTextEditingRedesignDescription[];
#endif // BUILDFLAG(IS_CHROMEOS)
#if defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS)
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
index 850602e8..834b85d8 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
@@ -8,7 +8,6 @@
#include <set>
#include <utility>
-#include "ash/constants/ash_features.h"
#include "base/auto_reset.h"
#include "base/bind.h"
#include "base/check_op.h"
@@ -89,6 +88,7 @@
#include "ui/base/metadata/metadata_impl_macros.h"
#include "ui/base/models/image_model.h"
#include "ui/base/models/simple_menu_model.h"
+#include "ui/base/ui_base_features.h"
#include "ui/compositor/layer.h"
#include "ui/events/event.h"
#include "ui/gfx/canvas.h"
@@ -1449,10 +1449,9 @@
}
bool OmniboxViewViews::IsCommandIdEnabled(int command_id) const {
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS)
if (command_id == Textfield::kSelectAll) {
- return base::FeatureList::IsEnabled(
- ash::features::kTouchTextEditingRedesign);
+ return features::IsTouchTextEditingRedesignEnabled();
}
#endif
if (command_id == Textfield::kPaste)
