Chromium Code Reviews| 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..7e2f42aca142cd6782926ff957c2c2810a8b5b7d 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::DoesHotwordSupportLanguage(profile)) |
| + web_ui()->CallJavascriptFunction("BrowserOptions.showAppListHotword"); |
|
Evan Stade
2014/02/11 18:54:12
you should do this in GetLocalizedValues (like the
Jun Mukai
2014/02/11 19:27:38
Done.
|
| #endif |
| } |