Commit de6ebaa2 authored by wutao's avatar wutao Committed by Commit Bot

assistant: Remove IsScreenContextQueryEnabled

Remove unused code.

Bug: b/145218971
Test: manual
Change-Id: I54e08fc38e967517212b2f41fabe6bb872d17cf3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2067938
Commit-Queue: Tao Wu <wutao@chromium.org>
Reviewed-by: default avatarXiaohui Chen <xiaohuic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#743408}
parent 330849fa
...@@ -1543,19 +1543,6 @@ void AssistantManagerServiceImpl::SendScreenContextRequest( ...@@ -1543,19 +1543,6 @@ void AssistantManagerServiceImpl::SendScreenContextRequest(
ax::mojom::AssistantExtra* assistant_extra, ax::mojom::AssistantExtra* assistant_extra,
ui::AssistantTree* assistant_tree, ui::AssistantTree* assistant_tree,
const std::vector<uint8_t>& assistant_screenshot) { const std::vector<uint8_t>& assistant_screenshot) {
if (assistant::features::IsScreenContextQueryEnabled()) {
assistant_client::VoicelessOptions options;
options.is_user_initiated = true;
assistant_manager_internal_->SendTextQueryWithClientDiscourseContext(
kScreenContextQuery,
CreateContextProto(
AssistantBundle{assistant_extra_.get(), assistant_tree_.get()},
assistant_screenshot),
options);
return;
}
std::vector<std::string> context_protos; std::vector<std::string> context_protos;
// Screen context can have the assistant_extra and assistant_tree set to // Screen context can have the assistant_extra and assistant_tree set to
......
...@@ -98,12 +98,6 @@ const base::Feature kEnableTextQueriesWithClientDiscourseContext{ ...@@ -98,12 +98,6 @@ const base::Feature kEnableTextQueriesWithClientDiscourseContext{
const base::Feature kEnablePowerManager{"ChromeOSAssistantEnablePowerManager", const base::Feature kEnablePowerManager{"ChromeOSAssistantEnablePowerManager",
base::FEATURE_DISABLED_BY_DEFAULT}; base::FEATURE_DISABLED_BY_DEFAULT};
// Enables sending a screen context request ("What's on my screen?" and
// metalayer selection) as a text query. This is as opposed to sending
// the request as a contextual cards request.
const base::Feature kScreenContextQuery{"ChromeOSAssistantScreenContextQuery",
base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kEnableMediaSessionIntegration{ const base::Feature kEnableMediaSessionIntegration{
"AssistantEnableMediaSessionIntegration", "AssistantEnableMediaSessionIntegration",
base::FEATURE_DISABLED_BY_DEFAULT}; base::FEATURE_DISABLED_BY_DEFAULT};
...@@ -194,10 +188,6 @@ bool IsRoutinesEnabled() { ...@@ -194,10 +188,6 @@ bool IsRoutinesEnabled() {
return base::FeatureList::IsEnabled(kAssistantRoutines); return base::FeatureList::IsEnabled(kAssistantRoutines);
} }
bool IsScreenContextQueryEnabled() {
return base::FeatureList::IsEnabled(kScreenContextQuery);
}
bool IsStereoAudioInputEnabled() { bool IsStereoAudioInputEnabled() {
return base::FeatureList::IsEnabled(kEnableStereoAudioInput) || return base::FeatureList::IsEnabled(kEnableStereoAudioInput) ||
// Audio eraser requires 2 channel input. // Audio eraser requires 2 channel input.
......
...@@ -137,8 +137,6 @@ bool IsResponseProcessingV2Enabled(); ...@@ -137,8 +137,6 @@ bool IsResponseProcessingV2Enabled();
COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC) bool IsRoutinesEnabled(); COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC) bool IsRoutinesEnabled();
COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC) bool IsScreenContextQueryEnabled();
COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC) bool IsStereoAudioInputEnabled(); COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC) bool IsStereoAudioInputEnabled();
COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC) bool IsWarmerWelcomeEnabled(); COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC) bool IsWarmerWelcomeEnabled();
......
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