assistant: only show assistant button when native

Xiaohui Chen · Xiaohui Chen · commit 31b64103e99c · 2018-09-05T18:11:09.000Z
Bug: 879401 Test: eve does not have assistant button Change-Id: Ie65d700eb6c052d2089bef6ec2a209bdd12dbc9b Reviewed-on: https://chromium-review.googlesource.com/1198282 Reviewed-by: Weidong Guo <weidongg@chromium.org> Commit-Queue: Xiaohui Chen <xiaohuic@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#587876}(cherry picked from commit bc895ea) Reviewed-on: https://chromium-review.googlesource.com/1207910 Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org> Cr-Commit-Position: refs/branch-heads/3538@{#56} Cr-Branched-From: 79f7c91-refs/heads/master@{#587811}
diff --git a/ash/app_list/app_list_controller_impl.cc b/ash/app_list/app_list_controller_impl.cc
@@ -801,6 +801,9 @@ void AppListControllerImpl::UpdateHomeLauncherVisibility() {
 }
 
 void AppListControllerImpl::UpdateAssistantVisibility() {
+  if (!chromeos::switches::IsAssistantEnabled())
+    return;
+
   auto* controller = Shell::Get()->voice_interaction_controller();
   GetSearchModel()->search_box()->SetShowAssistantButton(
       controller->settings_enabled() &&

Original file line number	Diff line number	Diff line change
`@@ -801,6 +801,9 @@ void AppListControllerImpl::UpdateHomeLauncherVisibility() {`
`801`	`801`	`}`
`802`	`802`
`803`	`803`	`void AppListControllerImpl::UpdateAssistantVisibility() {`
	`804`	`+ if (!chromeos::switches::IsAssistantEnabled())`
	`805`	`+ return;`
	`806`	`+`
`804`	`807`	`auto* controller = Shell::Get()->voice_interaction_controller();`
`805`	`808`	`GetSearchModel()->search_box()->SetShowAssistantButton(`
`806`	`809`	`controller->settings_enabled() &&`