| Index: chrome/browser/ui/webui/options/browser_options_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| index 5be4f546fee5583b6d09a5880da2d90686fcdcbf..e19a8a2a887e141177c1beac84e1eaba3fc84d46 100644
|
| --- a/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| @@ -379,6 +379,7 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
|
| IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_LONG },
|
| { "enableContentProtectionAttestation",
|
| IDS_OPTIONS_ENABLE_CONTENT_PROTECTION_ATTESTATION },
|
| + { "enableHotwordAppList", IDS_OPTIONS_ENABLE_HOTWORD_APP_LIST },
|
| { "factoryResetHeading", IDS_OPTIONS_FACTORY_RESET_HEADING },
|
| { "factoryResetTitle", IDS_OPTIONS_FACTORY_RESET },
|
| { "factoryResetRestart", IDS_OPTIONS_FACTORY_RESET_BUTTON },
|
| @@ -867,13 +868,16 @@ void BrowserOptionsHandler::InitializePage() {
|
| "BrowserOptions.enableFactoryResetSection");
|
| }
|
|
|
| + Profile* profile = Profile::FromWebUI(web_ui());
|
| OnAccountPictureManagedChanged(
|
| - policy::ProfilePolicyConnectorFactory::GetForProfile(
|
| - Profile::FromWebUI(web_ui()))->
|
| + policy::ProfilePolicyConnectorFactory::GetForProfile(profile)->
|
| policy_service()->GetPolicies(
|
| policy::PolicyNamespace(policy::POLICY_DOMAIN_CHROME,
|
| std::string()))
|
| .Get(policy::key::kUserAvatarImage));
|
| +
|
| + if (HotwordService::DoesLanguageSupportHotword(profile))
|
| + web_ui()->CallJavascriptFunction("BrowserOptions.showAppListHotword");
|
| #endif
|
| }
|
|
|
|
|