Commit 208ac2f2 authored by Kyle Horimoto's avatar Kyle Horimoto Committed by Commit Bot

[CrOS Settings] Fix Assistant search tags when disabled

When the Google Assistant is disabled, we should not show search results
for various settings within that subpage. The only action we should show
is "Turn on Assistant".

Fixed: 1096872
Change-Id: Idb3018a800c5a8268451717c20f205d1185457b9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2267408
Auto-Submit: Kyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Regan Hsu <hsuregan@chromium.org>
Reviewed-by: default avatarRegan Hsu <hsuregan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#782568}
parent c55865fb
...@@ -51,6 +51,20 @@ const std::vector<SearchConcept>& GetAssistantSearchConcepts() { ...@@ -51,6 +51,20 @@ const std::vector<SearchConcept>& GetAssistantSearchConcepts() {
mojom::SearchResultDefaultRank::kMedium, mojom::SearchResultDefaultRank::kMedium,
mojom::SearchResultType::kSubpage, mojom::SearchResultType::kSubpage,
{.subpage = mojom::Subpage::kAssistant}}, {.subpage = mojom::Subpage::kAssistant}},
});
return *tags;
}
const std::vector<SearchConcept>& GetAssistantOnSearchConcepts() {
static const base::NoDestructor<std::vector<SearchConcept>> tags({
{IDS_OS_SETTINGS_TAG_ASSISTANT_TURN_OFF,
mojom::kAssistantSubpagePath,
mojom::SearchResultIcon::kAssistant,
mojom::SearchResultDefaultRank::kMedium,
mojom::SearchResultType::kSetting,
{.setting = mojom::Setting::kAssistantOnOff},
{IDS_OS_SETTINGS_TAG_ASSISTANT_TURN_OFF_ALT1,
SearchConcept::kAltTagEnd}},
{IDS_OS_SETTINGS_TAG_ASSISTANT_PREFERRED_INPUT, {IDS_OS_SETTINGS_TAG_ASSISTANT_PREFERRED_INPUT,
mojom::kAssistantSubpagePath, mojom::kAssistantSubpagePath,
mojom::SearchResultIcon::kAssistant, mojom::SearchResultIcon::kAssistant,
...@@ -73,20 +87,6 @@ const std::vector<SearchConcept>& GetAssistantSearchConcepts() { ...@@ -73,20 +87,6 @@ const std::vector<SearchConcept>& GetAssistantSearchConcepts() {
return *tags; return *tags;
} }
const std::vector<SearchConcept>& GetAssistantOnSearchConcepts() {
static const base::NoDestructor<std::vector<SearchConcept>> tags({
{IDS_OS_SETTINGS_TAG_ASSISTANT_TURN_OFF,
mojom::kAssistantSubpagePath,
mojom::SearchResultIcon::kAssistant,
mojom::SearchResultDefaultRank::kMedium,
mojom::SearchResultType::kSetting,
{.setting = mojom::Setting::kAssistantOnOff},
{IDS_OS_SETTINGS_TAG_ASSISTANT_TURN_OFF_ALT1,
SearchConcept::kAltTagEnd}},
});
return *tags;
}
const std::vector<SearchConcept>& GetAssistantOffSearchConcepts() { const std::vector<SearchConcept>& GetAssistantOffSearchConcepts() {
static const base::NoDestructor<std::vector<SearchConcept>> tags({ static const base::NoDestructor<std::vector<SearchConcept>> tags({
{IDS_OS_SETTINGS_TAG_ASSISTANT_TURN_ON, {IDS_OS_SETTINGS_TAG_ASSISTANT_TURN_ON,
......
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