| Index: chrome/browser/ui/webui/settings/site_settings_handler.cc
|
| diff --git a/chrome/browser/ui/webui/settings/site_settings_handler.cc b/chrome/browser/ui/webui/settings/site_settings_handler.cc
|
| index 03595e1453cfa7e860e7f10d05e321d9194113f7..2697030d844498f9d19ca90a2ed85c7434b03c1a 100644
|
| --- a/chrome/browser/ui/webui/settings/site_settings_handler.cc
|
| +++ b/chrome/browser/ui/webui/settings/site_settings_handler.cc
|
| @@ -332,16 +332,10 @@ void SiteSettingsHandler::HandleGetDefaultValueForContentType(
|
| site_settings::ContentSettingsTypeFromGroupName(type)));
|
| HostContentSettingsMap* map =
|
| HostContentSettingsMapFactory::GetForProfile(profile_);
|
| - ContentSetting setting = map->GetDefaultContentSetting(content_type, nullptr);
|
|
|
| - // FullScreen is Allow vs. Ask.
|
| - bool enabled;
|
| - if (content_type == CONTENT_SETTINGS_TYPE_FULLSCREEN)
|
| - enabled = setting != CONTENT_SETTING_ASK;
|
| - else
|
| - enabled = setting != CONTENT_SETTING_BLOCK;
|
| -
|
| - ResolveJavascriptCallback(*callback_id, base::FundamentalValue(enabled));
|
| + std::string setting = content_settings::ContentSettingToString(
|
| + map->GetDefaultContentSetting(content_type, nullptr));
|
| + ResolveJavascriptCallback(*callback_id, base::StringValue(setting));
|
| }
|
|
|
| void SiteSettingsHandler::HandleGetExceptionList(const base::ListValue* args) {
|
|
|