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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 796543002: Plugin Power Saver: Implement option in Settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: "Fix" a browser test by disabling it. Fix a nit. Created 6 years 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
« chrome/browser/prerender/prerender_browsertest.cc ('K') | « chrome/browser/ui/webui/options/content_settings_handler.h ('k') | chrome/browser/ui/webui/options/website_settings_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b073fb36b37572f9009e795664a66aeaa48506b3..08222e7a1bc01e2fa8da2e8417260e6d894b54d5 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
@@ -281,134 +281,130 @@ void ContentSettingsHandler::GetLocalizedValues(
// TODO(dhnishi): Standardize to lowerCamelCase.
static OptionsStringResource resources[] = {
- { "allowException", IDS_EXCEPTIONS_ALLOW_BUTTON },
- { "blockException", IDS_EXCEPTIONS_BLOCK_BUTTON },
- { "sessionException", IDS_EXCEPTIONS_SESSION_ONLY_BUTTON },
- { "askException", IDS_EXCEPTIONS_ASK_BUTTON },
- { "otr_exceptions_explanation", IDS_EXCEPTIONS_OTR_LABEL },
- { "addNewExceptionInstructions", IDS_EXCEPTIONS_ADD_NEW_INSTRUCTIONS },
- { "manageExceptions", IDS_EXCEPTIONS_MANAGE },
- { "manage_handlers", IDS_HANDLERS_MANAGE },
- { "exceptionPatternHeader", IDS_EXCEPTIONS_PATTERN_HEADER },
- { "exceptionBehaviorHeader", IDS_EXCEPTIONS_ACTION_HEADER },
- { "exceptionZoomHeader", IDS_EXCEPTIONS_ZOOM_HEADER },
- { "embeddedOnHost", IDS_EXCEPTIONS_GEOLOCATION_EMBEDDED_ON_HOST },
+ {"allowException", IDS_EXCEPTIONS_ALLOW_BUTTON},
+ {"blockException", IDS_EXCEPTIONS_BLOCK_BUTTON},
+ {"sessionException", IDS_EXCEPTIONS_SESSION_ONLY_BUTTON},
+ {"detectException", IDS_EXCEPTIONS_DETECT_IMPORTANT_CONTENT_BUTTON},
+ {"askException", IDS_EXCEPTIONS_ASK_BUTTON},
+ {"otr_exceptions_explanation", IDS_EXCEPTIONS_OTR_LABEL},
+ {"addNewExceptionInstructions", IDS_EXCEPTIONS_ADD_NEW_INSTRUCTIONS},
+ {"manageExceptions", IDS_EXCEPTIONS_MANAGE},
+ {"manage_handlers", IDS_HANDLERS_MANAGE},
+ {"exceptionPatternHeader", IDS_EXCEPTIONS_PATTERN_HEADER},
+ {"exceptionBehaviorHeader", IDS_EXCEPTIONS_ACTION_HEADER},
+ {"exceptionZoomHeader", IDS_EXCEPTIONS_ZOOM_HEADER},
+ {"embeddedOnHost", IDS_EXCEPTIONS_GEOLOCATION_EMBEDDED_ON_HOST},
// Cookies filter.
- { "cookiesTabLabel", IDS_COOKIES_TAB_LABEL },
- { "cookies_header", IDS_COOKIES_HEADER },
- { "cookiesAllow", IDS_COOKIES_ALLOW_RADIO },
- { "cookiesBlock", IDS_COOKIES_BLOCK_RADIO },
- { "cookies_session_only", IDS_COOKIES_SESSION_ONLY_RADIO },
- { "cookies_block_3rd_party", IDS_COOKIES_BLOCK_3RDPARTY_CHKBOX },
- { "cookies_clear_when_close", IDS_COOKIES_CLEAR_WHEN_CLOSE_CHKBOX },
- { "cookies_lso_clear_when_close", IDS_COOKIES_LSO_CLEAR_WHEN_CLOSE_CHKBOX },
- { "cookies_show_cookies", IDS_COOKIES_SHOW_COOKIES_BUTTON },
- { "flash_storage_settings", IDS_FLASH_STORAGE_SETTINGS },
- { "flash_storage_url", IDS_FLASH_STORAGE_URL },
+ {"cookiesTabLabel", IDS_COOKIES_TAB_LABEL},
+ {"cookies_header", IDS_COOKIES_HEADER},
+ {"cookiesAllow", IDS_COOKIES_ALLOW_RADIO},
+ {"cookiesBlock", IDS_COOKIES_BLOCK_RADIO},
+ {"cookies_session_only", IDS_COOKIES_SESSION_ONLY_RADIO},
+ {"cookies_block_3rd_party", IDS_COOKIES_BLOCK_3RDPARTY_CHKBOX},
+ {"cookies_clear_when_close", IDS_COOKIES_CLEAR_WHEN_CLOSE_CHKBOX},
+ {"cookies_lso_clear_when_close", IDS_COOKIES_LSO_CLEAR_WHEN_CLOSE_CHKBOX},
+ {"cookies_show_cookies", IDS_COOKIES_SHOW_COOKIES_BUTTON},
+ {"flash_storage_settings", IDS_FLASH_STORAGE_SETTINGS},
+ {"flash_storage_url", IDS_FLASH_STORAGE_URL},
#if defined(ENABLE_GOOGLE_NOW)
- { "googleGeolocationAccessEnable",
- IDS_GEOLOCATION_GOOGLE_ACCESS_ENABLE_CHKBOX },
+ {"googleGeolocationAccessEnable",
+ IDS_GEOLOCATION_GOOGLE_ACCESS_ENABLE_CHKBOX},
#endif
// Image filter.
- { "imagesTabLabel", IDS_IMAGES_TAB_LABEL },
- { "images_header", IDS_IMAGES_HEADER },
- { "imagesAllow", IDS_IMAGES_LOAD_RADIO },
- { "imagesBlock", IDS_IMAGES_NOLOAD_RADIO },
+ {"imagesTabLabel", IDS_IMAGES_TAB_LABEL},
+ {"images_header", IDS_IMAGES_HEADER},
+ {"imagesAllow", IDS_IMAGES_LOAD_RADIO},
+ {"imagesBlock", IDS_IMAGES_NOLOAD_RADIO},
// JavaScript filter.
- { "javascriptTabLabel", IDS_JAVASCRIPT_TAB_LABEL },
- { "javascript_header", IDS_JAVASCRIPT_HEADER },
- { "javascriptAllow", IDS_JS_ALLOW_RADIO },
- { "javascriptBlock", IDS_JS_DONOTALLOW_RADIO },
+ {"javascriptTabLabel", IDS_JAVASCRIPT_TAB_LABEL},
+ {"javascript_header", IDS_JAVASCRIPT_HEADER},
+ {"javascriptAllow", IDS_JS_ALLOW_RADIO},
+ {"javascriptBlock", IDS_JS_DONOTALLOW_RADIO},
// Plug-ins filter.
- { "pluginsTabLabel", IDS_PLUGIN_TAB_LABEL },
- { "plugins_header", IDS_PLUGIN_HEADER },
- { "pluginsAsk", IDS_PLUGIN_ASK_RADIO },
- { "pluginsAllow", IDS_PLUGIN_LOAD_RADIO },
- { "pluginsBlock", IDS_PLUGIN_ASK_MENU_RADIO },
- { "disableIndividualPlugins", IDS_PLUGIN_SELECTIVE_DISABLE },
+ {"pluginsTabLabel", IDS_PLUGIN_TAB_LABEL},
+ {"plugins_header", IDS_PLUGIN_HEADER},
+ {"pluginsAllow", IDS_PLUGIN_ALLOW_RADIO},
+ {"pluginsDetect", IDS_PLUGIN_DETECT_RADIO},
+ {"pluginsBlock", IDS_PLUGIN_BLOCK_RADIO},
+ {"disableIndividualPlugins", IDS_PLUGIN_SELECTIVE_DISABLE},
// Pop-ups filter.
- { "popupsTabLabel", IDS_POPUP_TAB_LABEL },
- { "popups_header", IDS_POPUP_HEADER },
- { "popupsAllow", IDS_POPUP_ALLOW_RADIO },
- { "popupsBlock", IDS_POPUP_BLOCK_RADIO },
+ {"popupsTabLabel", IDS_POPUP_TAB_LABEL},
+ {"popups_header", IDS_POPUP_HEADER},
+ {"popupsAllow", IDS_POPUP_ALLOW_RADIO},
+ {"popupsBlock", IDS_POPUP_BLOCK_RADIO},
// Location filter.
- { "locationTabLabel", IDS_GEOLOCATION_TAB_LABEL },
- { "location_header", IDS_GEOLOCATION_HEADER },
- { "locationAllow", IDS_GEOLOCATION_ALLOW_RADIO },
- { "locationAsk", IDS_GEOLOCATION_ASK_RADIO },
- { "locationBlock", IDS_GEOLOCATION_BLOCK_RADIO },
- { "set_by", IDS_GEOLOCATION_SET_BY_HOVER },
+ {"locationTabLabel", IDS_GEOLOCATION_TAB_LABEL},
+ {"location_header", IDS_GEOLOCATION_HEADER},
+ {"locationAllow", IDS_GEOLOCATION_ALLOW_RADIO},
+ {"locationAsk", IDS_GEOLOCATION_ASK_RADIO},
+ {"locationBlock", IDS_GEOLOCATION_BLOCK_RADIO},
+ {"set_by", IDS_GEOLOCATION_SET_BY_HOVER},
// Notifications filter.
- { "notificationsTabLabel", IDS_NOTIFICATIONS_TAB_LABEL },
- { "notifications_header", IDS_NOTIFICATIONS_HEADER },
- { "notificationsAllow", IDS_NOTIFICATIONS_ALLOW_RADIO },
- { "notificationsAsk", IDS_NOTIFICATIONS_ASK_RADIO },
- { "notificationsBlock", IDS_NOTIFICATIONS_BLOCK_RADIO },
+ {"notificationsTabLabel", IDS_NOTIFICATIONS_TAB_LABEL},
+ {"notifications_header", IDS_NOTIFICATIONS_HEADER},
+ {"notificationsAllow", IDS_NOTIFICATIONS_ALLOW_RADIO},
+ {"notificationsAsk", IDS_NOTIFICATIONS_ASK_RADIO},
+ {"notificationsBlock", IDS_NOTIFICATIONS_BLOCK_RADIO},
// Fullscreen filter.
- { "fullscreenTabLabel", IDS_FULLSCREEN_TAB_LABEL },
- { "fullscreen_header", IDS_FULLSCREEN_HEADER },
+ {"fullscreenTabLabel", IDS_FULLSCREEN_TAB_LABEL},
+ {"fullscreen_header", IDS_FULLSCREEN_HEADER},
// Mouse Lock filter.
- { "mouselockTabLabel", IDS_MOUSE_LOCK_TAB_LABEL },
- { "mouselock_header", IDS_MOUSE_LOCK_HEADER },
- { "mouselockAllow", IDS_MOUSE_LOCK_ALLOW_RADIO },
- { "mouselockAsk", IDS_MOUSE_LOCK_ASK_RADIO },
- { "mouselockBlock", IDS_MOUSE_LOCK_BLOCK_RADIO },
+ {"mouselockTabLabel", IDS_MOUSE_LOCK_TAB_LABEL},
+ {"mouselock_header", IDS_MOUSE_LOCK_HEADER},
+ {"mouselockAllow", IDS_MOUSE_LOCK_ALLOW_RADIO},
+ {"mouselockAsk", IDS_MOUSE_LOCK_ASK_RADIO},
+ {"mouselockBlock", IDS_MOUSE_LOCK_BLOCK_RADIO},
#if defined(OS_CHROMEOS) || defined(OS_WIN)
// Protected Content filter
- { "protectedContentTabLabel", IDS_PROTECTED_CONTENT_TAB_LABEL },
- { "protectedContentInfo", IDS_PROTECTED_CONTENT_INFO },
- { "protectedContentEnable", IDS_PROTECTED_CONTENT_ENABLE },
- { "protectedContent_header", IDS_PROTECTED_CONTENT_HEADER },
+ {"protectedContentTabLabel", IDS_PROTECTED_CONTENT_TAB_LABEL},
+ {"protectedContentInfo", IDS_PROTECTED_CONTENT_INFO},
+ {"protectedContentEnable", IDS_PROTECTED_CONTENT_ENABLE},
+ {"protectedContent_header", IDS_PROTECTED_CONTENT_HEADER},
#endif // defined(OS_CHROMEOS) || defined(OS_WIN)
// Media stream capture device filter.
- { "mediaStreamTabLabel", IDS_MEDIA_STREAM_TAB_LABEL },
- { "media-stream_header", IDS_MEDIA_STREAM_HEADER },
- { "mediaStreamAsk", IDS_MEDIA_STREAM_ASK_RADIO },
- { "mediaStreamBlock", IDS_MEDIA_STREAM_BLOCK_RADIO },
- { "mediaStreamAudioAsk", IDS_MEDIA_STREAM_ASK_AUDIO_ONLY_RADIO },
- { "mediaStreamAudioBlock", IDS_MEDIA_STREAM_BLOCK_AUDIO_ONLY_RADIO },
- { "mediaStreamVideoAsk", IDS_MEDIA_STREAM_ASK_VIDEO_ONLY_RADIO },
- { "mediaStreamVideoBlock", IDS_MEDIA_STREAM_BLOCK_VIDEO_ONLY_RADIO },
- { "mediaStreamBubbleAudio", IDS_MEDIA_STREAM_AUDIO_MANAGED },
- { "mediaStreamBubbleVideo", IDS_MEDIA_STREAM_VIDEO_MANAGED },
- { "mediaAudioExceptionHeader", IDS_MEDIA_AUDIO_EXCEPTION_HEADER },
- { "mediaVideoExceptionHeader", IDS_MEDIA_VIDEO_EXCEPTION_HEADER },
- { "mediaPepperFlashDefaultDivergedLabel",
- IDS_MEDIA_PEPPER_FLASH_DEFAULT_DIVERGED_LABEL },
- { "mediaPepperFlashExceptionsDivergedLabel",
- IDS_MEDIA_PEPPER_FLASH_EXCEPTIONS_DIVERGED_LABEL },
- { "mediaPepperFlashChangeLink", IDS_MEDIA_PEPPER_FLASH_CHANGE_LINK },
- { "mediaPepperFlashGlobalPrivacyURL", IDS_FLASH_GLOBAL_PRIVACY_URL },
- { "mediaPepperFlashWebsitePrivacyURL", IDS_FLASH_WEBSITE_PRIVACY_URL },
+ {"mediaStreamTabLabel", IDS_MEDIA_STREAM_TAB_LABEL},
+ {"media-stream_header", IDS_MEDIA_STREAM_HEADER},
+ {"mediaStreamAsk", IDS_MEDIA_STREAM_ASK_RADIO},
+ {"mediaStreamBlock", IDS_MEDIA_STREAM_BLOCK_RADIO},
+ {"mediaStreamAudioAsk", IDS_MEDIA_STREAM_ASK_AUDIO_ONLY_RADIO},
+ {"mediaStreamAudioBlock", IDS_MEDIA_STREAM_BLOCK_AUDIO_ONLY_RADIO},
+ {"mediaStreamVideoAsk", IDS_MEDIA_STREAM_ASK_VIDEO_ONLY_RADIO},
+ {"mediaStreamVideoBlock", IDS_MEDIA_STREAM_BLOCK_VIDEO_ONLY_RADIO},
+ {"mediaStreamBubbleAudio", IDS_MEDIA_STREAM_AUDIO_MANAGED},
+ {"mediaStreamBubbleVideo", IDS_MEDIA_STREAM_VIDEO_MANAGED},
+ {"mediaAudioExceptionHeader", IDS_MEDIA_AUDIO_EXCEPTION_HEADER},
+ {"mediaVideoExceptionHeader", IDS_MEDIA_VIDEO_EXCEPTION_HEADER},
+ {"mediaPepperFlashDefaultDivergedLabel",
+ IDS_MEDIA_PEPPER_FLASH_DEFAULT_DIVERGED_LABEL},
+ {"mediaPepperFlashExceptionsDivergedLabel",
+ IDS_MEDIA_PEPPER_FLASH_EXCEPTIONS_DIVERGED_LABEL},
+ {"mediaPepperFlashChangeLink", IDS_MEDIA_PEPPER_FLASH_CHANGE_LINK},
+ {"mediaPepperFlashGlobalPrivacyURL", IDS_FLASH_GLOBAL_PRIVACY_URL},
+ {"mediaPepperFlashWebsitePrivacyURL", IDS_FLASH_WEBSITE_PRIVACY_URL},
// PPAPI broker filter.
- { "ppapi-broker_header", IDS_PPAPI_BROKER_HEADER },
- { "ppapiBrokerTabLabel", IDS_PPAPI_BROKER_TAB_LABEL },
- { "ppapiBrokerAllow", IDS_PPAPI_BROKER_ALLOW_RADIO },
- { "ppapiBrokerAsk", IDS_PPAPI_BROKER_ASK_RADIO },
- { "ppapiBrokerBlock", IDS_PPAPI_BROKER_BLOCK_RADIO },
+ {"ppapi-broker_header", IDS_PPAPI_BROKER_HEADER},
+ {"ppapiBrokerTabLabel", IDS_PPAPI_BROKER_TAB_LABEL},
+ {"ppapiBrokerAllow", IDS_PPAPI_BROKER_ALLOW_RADIO},
+ {"ppapiBrokerAsk", IDS_PPAPI_BROKER_ASK_RADIO},
+ {"ppapiBrokerBlock", IDS_PPAPI_BROKER_BLOCK_RADIO},
// Multiple automatic downloads
- { "multipleAutomaticDownloadsTabLabel",
- IDS_AUTOMATIC_DOWNLOADS_TAB_LABEL },
- { "multiple-automatic-downloads_header",
- IDS_AUTOMATIC_DOWNLOADS_TAB_LABEL },
- { "multipleAutomaticDownloadsAllow",
- IDS_AUTOMATIC_DOWNLOADS_ALLOW_RADIO },
- { "multipleAutomaticDownloadsAsk",
- IDS_AUTOMATIC_DOWNLOADS_ASK_RADIO },
- { "multipleAutomaticDownloadsBlock",
- IDS_AUTOMATIC_DOWNLOADS_BLOCK_RADIO },
+ {"multipleAutomaticDownloadsTabLabel", IDS_AUTOMATIC_DOWNLOADS_TAB_LABEL},
+ {"multiple-automatic-downloads_header", IDS_AUTOMATIC_DOWNLOADS_TAB_LABEL},
+ {"multipleAutomaticDownloadsAllow", IDS_AUTOMATIC_DOWNLOADS_ALLOW_RADIO},
+ {"multipleAutomaticDownloadsAsk", IDS_AUTOMATIC_DOWNLOADS_ASK_RADIO},
+ {"multipleAutomaticDownloadsBlock", IDS_AUTOMATIC_DOWNLOADS_BLOCK_RADIO},
// MIDI system exclusive messages
- { "midi-sysex_header", IDS_MIDI_SYSEX_TAB_LABEL },
- { "midiSysExAllow", IDS_MIDI_SYSEX_ALLOW_RADIO },
- { "midiSysExAsk", IDS_MIDI_SYSEX_ASK_RADIO },
- { "midiSysExBlock", IDS_MIDI_SYSEX_BLOCK_RADIO },
+ {"midi-sysex_header", IDS_MIDI_SYSEX_TAB_LABEL},
+ {"midiSysExAllow", IDS_MIDI_SYSEX_ALLOW_RADIO},
+ {"midiSysExAsk", IDS_MIDI_SYSEX_ASK_RADIO},
+ {"midiSysExBlock", IDS_MIDI_SYSEX_BLOCK_RADIO},
// Push messaging strings
- { "push-messaging_header", IDS_PUSH_MESSAGES_TAB_LABEL },
- { "pushMessagingAllow", IDS_PUSH_MESSSAGING_ALLOW_RADIO },
- { "pushMessagingAsk", IDS_PUSH_MESSSAGING_ASK_RADIO },
- { "pushMessagingBlock", IDS_PUSH_MESSSAGING_BLOCK_RADIO },
- { "zoomlevels_header", IDS_ZOOMLEVELS_HEADER_AND_TAB_LABEL },
- { "zoomLevelsManage", IDS_ZOOMLEVELS_MANAGE_BUTTON },
+ {"push-messaging_header", IDS_PUSH_MESSAGES_TAB_LABEL},
+ {"pushMessagingAllow", IDS_PUSH_MESSSAGING_ALLOW_RADIO},
+ {"pushMessagingAsk", IDS_PUSH_MESSSAGING_ASK_RADIO},
+ {"pushMessagingBlock", IDS_PUSH_MESSSAGING_BLOCK_RADIO},
+ {"zoomlevels_header", IDS_ZOOMLEVELS_HEADER_AND_TAB_LABEL},
+ {"zoomLevelsManage", IDS_ZOOMLEVELS_MANAGE_BUTTON},
};
RegisterStrings(localized_strings, resources, arraysize(resources));
@@ -592,10 +588,21 @@ void ContentSettingsHandler::OnGetPermissionSettingsCompleted(
void ContentSettingsHandler::UpdateSettingDefaultFromModel(
ContentSettingsType type) {
- base::DictionaryValue filter_settings;
+ Profile* profile = Profile::FromWebUI(web_ui());
std::string provider_id;
+ ContentSetting default_setting =
+ profile->GetHostContentSettingsMap()->GetDefaultContentSetting(
+ type, &provider_id);
+
+ // For Plugins, display the obsolete ASK setting as BLOCK.
+ if (type == ContentSettingsType::CONTENT_SETTINGS_TYPE_PLUGINS &&
+ default_setting == ContentSetting::CONTENT_SETTING_ASK) {
+ default_setting = ContentSetting::CONTENT_SETTING_BLOCK;
+ }
+
+ base::DictionaryValue filter_settings;
filter_settings.SetString(ContentSettingsTypeToGroupName(type) + ".value",
- GetSettingDefaultFromModel(type, &provider_id));
+ ContentSettingToString(default_setting));
filter_settings.SetString(
ContentSettingsTypeToGroupName(type) + ".managedBy", provider_id);
@@ -669,17 +676,6 @@ void ContentSettingsHandler::UpdateMediaSettingsView() {
media_ui_settings);
}
-std::string ContentSettingsHandler::GetSettingDefaultFromModel(
- ContentSettingsType type, std::string* provider_id) {
- Profile* profile = Profile::FromWebUI(web_ui());
- ContentSetting default_setting;
- default_setting =
- profile->GetHostContentSettingsMap()->GetDefaultContentSetting(
- type, provider_id);
-
- return ContentSettingToString(default_setting);
-}
-
void ContentSettingsHandler::UpdateHandlersEnabledRadios() {
base::FundamentalValue handlers_enabled(
GetProtocolHandlerRegistry()->enabled());
« chrome/browser/prerender/prerender_browsertest.cc ('K') | « chrome/browser/ui/webui/options/content_settings_handler.h ('k') | chrome/browser/ui/webui/options/website_settings_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698