Commit 52326a4a authored by David Black's avatar David Black Committed by Commit Bot

Remove AssistantVisibility::kHidden.

Bug: b:148080975
Change-Id: I538b8b2af8cd4df5e7efc276b769c8009c942006
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2036351Reviewed-by: default avatarTao Wu <wutao@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Reviewed-by: default avatarXiaohui Chen <xiaohuic@chromium.org>
Commit-Queue: David Black <dmblack@google.com>
Cr-Commit-Position: refs/heads/master@{#737937}
parent ec072c3e
...@@ -838,9 +838,6 @@ void AppListControllerImpl::OnUiVisibilityChanged( ...@@ -838,9 +838,6 @@ void AppListControllerImpl::OnUiVisibilityChanged(
// changed to visible by this point. // changed to visible by this point.
presenter_.SetViewVisibility(true); presenter_.SetViewVisibility(true);
break; break;
case AssistantVisibility::kHidden:
NOTREACHED();
break;
case AssistantVisibility::kClosed: case AssistantVisibility::kClosed:
if (!IsShowingEmbeddedAssistantUI()) if (!IsShowingEmbeddedAssistantUI())
break; break;
......
...@@ -273,15 +273,6 @@ void AssistantInteractionController::OnUiVisibilityChanged( ...@@ -273,15 +273,6 @@ void AssistantInteractionController::OnUiVisibilityChanged(
model_.ClearInteraction(); model_.ClearInteraction();
model_.SetInputModality(GetDefaultInputModality()); model_.SetInputModality(GetDefaultInputModality());
break; break;
case AssistantVisibility::kHidden:
// When the UI is hidden we stop any voice query in progress so that we
// don't listen to the user while not visible. We also restore the default
// input modality for the next launch.
if (model_.pending_query().type() == AssistantQueryType::kVoice) {
StopActiveInteraction(false);
}
model_.SetInputModality(GetDefaultInputModality());
break;
case AssistantVisibility::kVisible: case AssistantVisibility::kVisible:
OnUiVisible(entry_point.value()); OnUiVisible(entry_point.value());
break; break;
......
...@@ -145,7 +145,6 @@ void AssistantNotificationController::OnUiVisibilityChanged( ...@@ -145,7 +145,6 @@ void AssistantNotificationController::OnUiVisibilityChanged(
model_.AddOrUpdateNotification(std::move(update)); model_.AddOrUpdateNotification(std::move(update));
} }
break; break;
case AssistantVisibility::kHidden:
case AssistantVisibility::kClosed: case AssistantVisibility::kClosed:
// When the Assistant UI is no longer visible to the user we remove any // When the Assistant UI is no longer visible to the user we remove any
// notifications of type |kInAssistant| as this type of notification does // notifications of type |kInAssistant| as this type of notification does
......
...@@ -34,11 +34,6 @@ void AssistantUiModel::SetVisible(AssistantEntryPoint entry_point) { ...@@ -34,11 +34,6 @@ void AssistantUiModel::SetVisible(AssistantEntryPoint entry_point) {
/*exit_point=*/base::nullopt); /*exit_point=*/base::nullopt);
} }
void AssistantUiModel::SetHidden(AssistantExitPoint exit_point) {
SetVisibility(AssistantVisibility::kHidden,
/*entry_point=*/base::nullopt, exit_point);
}
void AssistantUiModel::SetClosed(AssistantExitPoint exit_point) { void AssistantUiModel::SetClosed(AssistantExitPoint exit_point) {
SetVisibility(AssistantVisibility::kClosed, SetVisibility(AssistantVisibility::kClosed,
/*entry_point=*/base::nullopt, exit_point); /*entry_point=*/base::nullopt, exit_point);
......
...@@ -24,7 +24,6 @@ enum class AssistantUiMode { ...@@ -24,7 +24,6 @@ enum class AssistantUiMode {
// Enumeration of Assistant visibility states. // Enumeration of Assistant visibility states.
enum class AssistantVisibility { enum class AssistantVisibility {
kClosed, // Assistant UI is hidden and the previous session has finished. kClosed, // Assistant UI is hidden and the previous session has finished.
kHidden, // Assistant UI is hidden and the previous session is paused.
kVisible, // Assistant UI is visible and a session is in progress. kVisible, // Assistant UI is visible and a session is in progress.
}; };
...@@ -64,7 +63,6 @@ class COMPONENT_EXPORT(ASSISTANT_MODEL) AssistantUiModel { ...@@ -64,7 +63,6 @@ class COMPONENT_EXPORT(ASSISTANT_MODEL) AssistantUiModel {
// Sets the UI visibility. // Sets the UI visibility.
void SetVisible(AssistantEntryPoint entry_point); void SetVisible(AssistantEntryPoint entry_point);
void SetHidden(AssistantExitPoint exit_point);
void SetClosed(AssistantExitPoint exit_point); void SetClosed(AssistantExitPoint exit_point);
AssistantVisibility visibility() const { return visibility_; } AssistantVisibility visibility() const { return visibility_; }
......
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