Index: chrome/browser/ui/webui/options/content_settings_handler.cc |
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc |
index 7f6b9e09f6314270f5e056a1f6b71abb61215d95..2d383f52e1dea70ca1471dee4a06b9142ff3c0de 100644 |
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc |
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc |
@@ -263,6 +263,9 @@ void ContentSettingsHandler::GetLocalizedValues( |
{ "intentsAsk", IDS_INTENTS_ASK_RADIO }, |
{ "intentsBlock", IDS_INTENTS_BLOCK_RADIO }, |
{ "intents_header", IDS_INTENTS_HEADER }, |
+ // Fullscreen filter. |
+ { "fullscreen_tab_label", IDS_FULLSCREEN_TAB_LABEL }, |
+ { "fullscreen_header", IDS_FULLSCREEN_HEADER }, |
}; |
RegisterStrings(localized_strings, resources, arraysize(resources)); |
@@ -413,9 +416,6 @@ void ContentSettingsHandler::UpdateAllExceptionsViewsFromModel() { |
// for this content type and we skip it here. |
if (type == CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE) |
continue; |
- // TODO(koz): Implement fullscreen content settings UI. |
- if (type == CONTENT_SETTINGS_TYPE_FULLSCREEN) |
- continue; |
// TODO(scheib): Mouse lock content settings UI. http://crbug.com/97768 |
if (type == CONTENT_SETTINGS_TYPE_MOUSELOCK) |
continue; |
@@ -589,6 +589,11 @@ void ContentSettingsHandler::UpdateExceptionsViewFromHostContentSettingsMap( |
UpdateExceptionsViewFromOTRHostContentSettingsMap(type); |
+ // TODO(koz): The default for fullscreen is always 'ask'. |
+ // http://crbug.com/104683 |
+ if (type == CONTENT_SETTINGS_TYPE_FULLSCREEN) |
+ return; |
+ |
// The default may also have changed (we won't get a separate notification). |
// If it hasn't changed, this call will be harmless. |
UpdateSettingDefaultFromModel(type); |