Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4965)

Unified Diff: chrome/browser/ui/webui/options/content_settings_handler.cc

Issue 8585047: Add a section for the fullscreen JS API in the content settings page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: disable ask in content settings map Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..fb4ff6ba0753caf55980a71416c71a41de511913 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);
+ // Fullscreen doesn't have enable / disable functionality.
Evan Stade 2011/11/18 00:13:58 what is enable disable functionality?
+ 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);

Powered by Google App Engine
This is Rietveld 408576698