Commit 8c398ad0 authored by wutao's avatar wutao Committed by Commit Bot

assistant: Remove unused flag for text query with context

Remove unused code related to kEnableTextQueriesWithClientDiscourseContext.

Bug: b/145218971
Test: manual
Change-Id: Iceb7a5be8f0d95939542637fd17ebf2ac1648569
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2080819Reviewed-by: default avatarXiaohui Chen <xiaohuic@chromium.org>
Commit-Queue: Tao Wu <wutao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746586}
parent ea1dd9ab
......@@ -546,23 +546,9 @@ void AssistantManagerServiceImpl::StartTextInteraction(
options.conversation_turn_id = NewPendingInteraction(
mojom::AssistantInteractionType::kText, source, query);
if (base::FeatureList::IsEnabled(
assistant::features::kEnableTextQueriesWithClientDiscourseContext) &&
assistant_extra_ && assistant_tree_) {
// We don't send the screenshot, because the backend only needs the
// view hierarchy to resolve contextual queries such as "Who is he?".
assistant_manager_internal_->SendTextQueryWithClientDiscourseContext(
query,
CreateContextProto(
AssistantBundle{assistant_extra_.get(), assistant_tree_.get()},
is_first_client_discourse_context_query_),
options);
is_first_client_discourse_context_query_ = false;
} else {
std::string interaction = CreateTextQueryInteraction(query);
assistant_manager_internal_->SendVoicelessInteraction(
interaction, /*description=*/"text_query", options, [](auto) {});
}
std::string interaction = CreateTextQueryInteraction(query);
assistant_manager_internal_->SendVoicelessInteraction(
interaction, /*description=*/"text_query", options, [](auto) {});
}
void AssistantManagerServiceImpl::AddAssistantInteractionSubscriber(
......@@ -1492,7 +1478,6 @@ void AssistantManagerServiceImpl::ClearScreenContextCache() {
assistant_extra_.reset();
assistant_tree_.reset();
assistant_screenshot_.clear();
is_first_client_discourse_context_query_ = true;
}
void AssistantManagerServiceImpl::OnAccessibilityStatusChanged(
......
......@@ -372,8 +372,6 @@ class COMPONENT_EXPORT(ASSISTANT_SERVICE) AssistantManagerServiceImpl
bool receive_inline_response_ = false;
std::string receive_url_response_;
bool is_first_client_discourse_context_query_ = true;
mojo::Receiver<media_session::mojom::MediaControllerObserver>
media_controller_observer_receiver_{this};
......
......@@ -91,10 +91,6 @@ const base::Feature kEnableDspHotword{"EnableDspHotword",
const base::Feature kEnableStereoAudioInput{"AssistantEnableStereoAudioInput",
base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kEnableTextQueriesWithClientDiscourseContext{
"AssistantEnableTextQueriesWithClientDiscourseContext",
base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kEnablePowerManager{"ChromeOSAssistantEnablePowerManager",
base::FEATURE_DISABLED_BY_DEFAULT};
......
......@@ -81,10 +81,6 @@ extern const base::Feature kEnableStereoAudioInput;
COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC)
extern const base::Feature kEnablePowerManager;
// Enables sending the client discourse context with text queries.
COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC)
extern const base::Feature kEnableTextQueriesWithClientDiscourseContext;
COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC)
int GetProactiveSuggestionsMaxWidth();
......
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