Commit 37b6757f authored by David Black's avatar David Black Committed by Commit Bot

Reinstate eligibility checks.

Was previously circumvented for development purposes.

Bug: b:79120852
Change-Id: I68cf1fea763dd84ab886cf7e3e5df7cadfe616a5
Reviewed-on: https://chromium-review.googlesource.com/1142288Reviewed-by: default avatarAhmed Fakhry <afakhry@chromium.org>
Reviewed-by: default avatarXiaohui Chen <xiaohuic@chromium.org>
Commit-Queue: David Black <dmblack@google.com>
Cr-Commit-Position: refs/heads/master@{#576251}
parent fe17281d
......@@ -677,14 +677,6 @@ void HandleToggleVoiceInteraction(const ui::Accelerator& accelerator) {
base::UserMetricsAction("VoiceInteraction.Started.Assistant"));
}
// TODO(dmblack): Remove. Enabling eligibility check bypass for development
// purposes only. We should otherwise respect the eligibility rules below.
if (chromeos::switches::IsAssistantEnabled()) {
Shell::Get()->assistant_controller()->ui_controller()->ToggleUi(
AssistantSource::kHotkey);
return;
}
switch (Shell::Get()->voice_interaction_controller()->allowed_state()) {
case mojom::AssistantAllowedState::DISALLOWED_BY_NONPRIMARY_USER:
// Show a toast if the active user is not primary.
......
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