| Index: chrome/browser/ui/webui/app_list/start_page_handler.cc
|
| diff --git a/chrome/browser/ui/webui/app_list/start_page_handler.cc b/chrome/browser/ui/webui/app_list/start_page_handler.cc
|
| index ed4f55097a3d358be8c3605f2bc7d830f05ecd7e..70a215cf9f0f20a8c99170707df8e293e148d7a0 100644
|
| --- a/chrome/browser/ui/webui/app_list/start_page_handler.cc
|
| +++ b/chrome/browser/ui/webui/app_list/start_page_handler.cc
|
| @@ -195,14 +195,13 @@ void StartPageHandler::HandleInitialize(const base::ListValue* args) {
|
| }
|
| #endif
|
|
|
| - if (!app_list::switches::IsExperimentalAppListEnabled()) {
|
| - // If experimental hotwording is enabled, don't enable hotwording in the
|
| - // start page, since the hotword extension is taking care of this.
|
| - bool hotword_enabled = service->HotwordEnabled() &&
|
| - !HotwordService::IsExperimentalHotwordingEnabled();
|
| + // If v2 hotwording is enabled, don't tell the start page that the app list is
|
| + // being shown. V2 hotwording doesn't use the start page for anything.
|
| + if (!app_list::switches::IsExperimentalAppListEnabled() &&
|
| + !HotwordService::IsExperimentalHotwordingEnabled()) {
|
| web_ui()->CallJavascriptFunction(
|
| "appList.startPage.onAppListShown",
|
| - base::FundamentalValue(hotword_enabled));
|
| + base::FundamentalValue(service->HotwordEnabled()));
|
| }
|
| }
|
|
|
|
|