Commit 29d3cc04 authored by Meilin Wang's avatar Meilin Wang Committed by Commit Bot

Clean up client codes for assistant key remapping.

Delete kAssistantKeyRemapping feature flag and chrome flag since this
feature has been launched.

Bug: none.
Test: local compile and manually test.
Change-Id: Ieb8781dbb60c4ec7049c666ce05f0ce100695ea6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1715095Reviewed-by: default avatarXiaohui Chen <xiaohuic@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Meilin Wang <meilinw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#680115}
parent 4ae1e502
...@@ -3530,11 +3530,6 @@ const FeatureEntry kFeatureEntries[] = { ...@@ -3530,11 +3530,6 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kEnableAssistantAppSupportDescription, kOsCrOS, flag_descriptions::kEnableAssistantAppSupportDescription, kOsCrOS,
FEATURE_VALUE_TYPE(chromeos::assistant::features::kAssistantAppSupport)}, FEATURE_VALUE_TYPE(chromeos::assistant::features::kAssistantAppSupport)},
{"enable-assistant-key-remapping",
flag_descriptions::kEnableAssistantKeyRemappingName,
flag_descriptions::kEnableAssistantKeyRemappingDescription, kOsCrOS,
FEATURE_VALUE_TYPE(chromeos::assistant::features::kAssistantKeyRemapping)},
{"enable-assistant-media-session-integration", {"enable-assistant-media-session-integration",
flag_descriptions::kEnableAssistantMediaSessionIntegrationName, flag_descriptions::kEnableAssistantMediaSessionIntegrationName,
flag_descriptions::kEnableAssistantMediaSessionIntegrationDescription, flag_descriptions::kEnableAssistantMediaSessionIntegrationDescription,
......
...@@ -3126,11 +3126,6 @@ const char kEnableAssistantAppSupportName[] = "Enable Assistant App Support"; ...@@ -3126,11 +3126,6 @@ const char kEnableAssistantAppSupportName[] = "Enable Assistant App Support";
const char kEnableAssistantAppSupportDescription[] = const char kEnableAssistantAppSupportDescription[] =
"Enable the Assistant App Support feature"; "Enable the Assistant App Support feature";
const char kEnableAssistantKeyRemappingName[] =
"Enable Assistant Key Remapping";
const char kEnableAssistantKeyRemappingDescription[] =
"Allow Assistant key remapping in the keyboard settings.";
const char kEnableAssistantLauncherIntegrationName[] = const char kEnableAssistantLauncherIntegrationName[] =
"Assistant & Launcher integration"; "Assistant & Launcher integration";
const char kEnableAssistantLauncherIntegrationDescription[] = const char kEnableAssistantLauncherIntegrationDescription[] =
......
...@@ -1870,9 +1870,6 @@ extern const char kEnableArcUnifiedAudioFocusDescription[]; ...@@ -1870,9 +1870,6 @@ extern const char kEnableArcUnifiedAudioFocusDescription[];
extern const char kEnableAssistantAppSupportName[]; extern const char kEnableAssistantAppSupportName[];
extern const char kEnableAssistantAppSupportDescription[]; extern const char kEnableAssistantAppSupportDescription[];
extern const char kEnableAssistantKeyRemappingName[];
extern const char kEnableAssistantKeyRemappingDescription[];
extern const char kEnableAssistantLauncherIntegrationName[]; extern const char kEnableAssistantLauncherIntegrationName[];
extern const char kEnableAssistantLauncherIntegrationDescription[]; extern const char kEnableAssistantLauncherIntegrationDescription[];
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
#include "base/values.h" #include "base/values.h"
#include "chrome/browser/ui/ash/tablet_mode_client.h" #include "chrome/browser/ui/ash/tablet_mode_client.h"
#include "chromeos/constants/chromeos_switches.h" #include "chromeos/constants/chromeos_switches.h"
#include "chromeos/services/assistant/public/features.h"
#include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui.h"
#include "content/public/common/service_manager_connection.h" #include "content/public/common/service_manager_connection.h"
#include "services/service_manager/public/cpp/connector.h" #include "services/service_manager/public/cpp/connector.h"
...@@ -150,9 +149,7 @@ void KeyboardHandler::UpdateShowKeys() { ...@@ -150,9 +149,7 @@ void KeyboardHandler::UpdateShowKeys() {
keyboard_params.SetKey("hasInternalKeyboard", keyboard_params.SetKey("hasInternalKeyboard",
base::Value(keyboards_state.has_internal_keyboard)); base::Value(keyboards_state.has_internal_keyboard));
const bool show_assistant_key_settings = const bool show_assistant_key_settings = ui::DeviceKeyboardHasAssistantKey();
chromeos::assistant::features::IsKeyRemappingEnabled() &&
ui::DeviceKeyboardHasAssistantKey();
keyboard_params.SetKey("hasAssistantKey", keyboard_params.SetKey("hasAssistantKey",
base::Value(show_assistant_key_settings)); base::Value(show_assistant_key_settings));
......
...@@ -53,9 +53,6 @@ const base::Feature kEnableAssistantAlarmTimerManager{ ...@@ -53,9 +53,6 @@ const base::Feature kEnableAssistantAlarmTimerManager{
const base::Feature kEnablePowerManager{"ChromeOSAssistantEnablePowerManager", const base::Feature kEnablePowerManager{"ChromeOSAssistantEnablePowerManager",
base::FEATURE_DISABLED_BY_DEFAULT}; base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kAssistantKeyRemapping{"AssistantKeyRemapping",
base::FEATURE_DISABLED_BY_DEFAULT};
// Enables sending a screen context request ("What's on my screen?" and // Enables sending a screen context request ("What's on my screen?" and
// metalayer selection) as a text query. This is as opposed to sending // metalayer selection) as a text query. This is as opposed to sending
// the request as a contextual cards request. // the request as a contextual cards request.
...@@ -95,10 +92,6 @@ bool IsInAssistantNotificationsEnabled() { ...@@ -95,10 +92,6 @@ bool IsInAssistantNotificationsEnabled() {
return base::FeatureList::IsEnabled(kInAssistantNotifications); return base::FeatureList::IsEnabled(kInAssistantNotifications);
} }
bool IsKeyRemappingEnabled() {
return base::FeatureList::IsEnabled(kAssistantKeyRemapping);
}
bool IsMediaSessionIntegrationEnabled() { bool IsMediaSessionIntegrationEnabled() {
return base::FeatureList::IsEnabled(kEnableMediaSessionIntegration); return base::FeatureList::IsEnabled(kEnableMediaSessionIntegration);
} }
......
...@@ -76,10 +76,6 @@ extern const base::Feature kEnableTextQueriesWithClientDiscourseContext; ...@@ -76,10 +76,6 @@ extern const base::Feature kEnableTextQueriesWithClientDiscourseContext;
COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC) COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC)
extern const base::Feature kTimerTicks; extern const base::Feature kTimerTicks;
// Enables Assistant key remapping on keyboards.
COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC)
extern const base::Feature kAssistantKeyRemapping;
COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC) bool IsAlarmTimerManagerEnabled(); COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC) bool IsAlarmTimerManagerEnabled();
COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC) bool IsAppSupportEnabled(); COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC) bool IsAppSupportEnabled();
......
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