| Index: chrome/browser/ui/webui/plugins/plugins_handler.cc
|
| diff --git a/chrome/browser/ui/webui/plugins/plugins_handler.cc b/chrome/browser/ui/webui/plugins/plugins_handler.cc
|
| index 29c3ebf1e9db8add2e3ebc83a7293adb290e4cf6..4aaa5ebd86a7d89775062ead1e4227d086b3c5ac 100644
|
| --- a/chrome/browser/ui/webui/plugins/plugins_handler.cc
|
| +++ b/chrome/browser/ui/webui/plugins/plugins_handler.cc
|
| @@ -261,13 +261,14 @@ mojo::Array<mojom::PluginDataPtr> PluginsPageHandler::GeneratePluginsData(
|
|
|
| plugin_data->always_allowed = false;
|
| plugin_data->trusted = false;
|
| + plugin_data->policy_click_to_play = GetClickToPlayPolicyEnabled();
|
|
|
| if (group_enabled) {
|
| if (plugin_metadata->GetSecurityStatus(*active_plugin) ==
|
| PluginMetadata::SECURITY_STATUS_FULLY_TRUSTED) {
|
| plugin_data->trusted = true;
|
| plugin_data->always_allowed = true;
|
| - } else {
|
| + } else if (!GetClickToPlayPolicyEnabled()) {
|
| const base::DictionaryValue* whitelist =
|
| profile->GetPrefs()->GetDictionary(
|
| prefs::kContentSettingsPluginWhitelist);
|
| @@ -294,6 +295,16 @@ mojo::Array<mojom::PluginDataPtr> PluginsPageHandler::GeneratePluginsData(
|
| return plugins_data;
|
| }
|
|
|
| +bool PluginsPageHandler::GetClickToPlayPolicyEnabled() const {
|
| + Profile* profile = Profile::FromWebUI(web_ui_);
|
| + HostContentSettingsMap* map =
|
| + HostContentSettingsMapFactory::GetForProfile(profile);
|
| + std::string provider_id;
|
| + ContentSetting setting = map->GetDefaultContentSetting(
|
| + CONTENT_SETTINGS_TYPE_PLUGINS, &provider_id);
|
| + return (setting == CONTENT_SETTING_ASK && provider_id == "policy");
|
| +}
|
| +
|
| mojom::PluginFilePtr PluginsPageHandler::GeneratePluginFile(
|
| const WebPluginInfo& plugin,
|
| const base::string16& group_name,
|
|
|