Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4282)

Unified Diff: chrome/browser/ui/webui/app_list/start_page_handler.cc

Issue 793573003: With V2 hotwording enabled, don't inform the start page that the launcher has opened. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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()));
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698