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 2e5ee067d27bf497e18f1d1cf177015afbf71a5d..4913bf8e9ef76a525ada1d8d0b4d2798281276d0 100644 |
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc |
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc |
@@ -275,78 +275,77 @@ void ContentSettingsHandler::GetLocalizedValues( |
base::DictionaryValue* localized_strings) { |
DCHECK(localized_strings); |
- // TODO(dhnishi): Standardize to lowerCamelCase. |
static OptionsStringResource resources[] = { |
{"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}, |
+ {"otrExceptionsExplanation", IDS_EXCEPTIONS_OTR_LABEL}, |
{"addNewExceptionInstructions", IDS_EXCEPTIONS_ADD_NEW_INSTRUCTIONS}, |
{"manageExceptions", IDS_EXCEPTIONS_MANAGE}, |
- {"manage_handlers", IDS_HANDLERS_MANAGE}, |
+ {"manageHandlers", 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}, |
+ {"cookiesHeader", IDS_COOKIES_HEADER}, |
{"cookiesAllow", IDS_COOKIES_ALLOW_RADIO}, |
{"cookiesBlock", IDS_COOKIES_BLOCK_RADIO}, |
{"cookiesSession", 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}, |
+ {"cookiesBlock3rdParty", IDS_COOKIES_BLOCK_3RDPARTY_CHKBOX}, |
+ {"cookiesClearWhenClose", IDS_COOKIES_CLEAR_WHEN_CLOSE_CHKBOX}, |
+ {"cookiesLsoClearWhenClose", IDS_COOKIES_LSO_CLEAR_WHEN_CLOSE_CHKBOX}, |
+ {"cookiesShowCookies", IDS_COOKIES_SHOW_COOKIES_BUTTON}, |
+ {"flashStorageSettings", IDS_FLASH_STORAGE_SETTINGS}, |
+ {"flashStorageUrl", IDS_FLASH_STORAGE_URL}, |
#if defined(ENABLE_GOOGLE_NOW) |
{"googleGeolocationAccessEnable", |
IDS_GEOLOCATION_GOOGLE_ACCESS_ENABLE_CHKBOX}, |
#endif |
// Image filter. |
{"imagesTabLabel", IDS_IMAGES_TAB_LABEL}, |
- {"images_header", IDS_IMAGES_HEADER}, |
+ {"imagesHeader", 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}, |
+ {"javascriptHeader", IDS_JAVASCRIPT_HEADER}, |
{"javascriptAllow", IDS_JS_ALLOW_RADIO}, |
{"javascriptBlock", IDS_JS_DONOTALLOW_RADIO}, |
// Plugins filter. |
{"pluginsTabLabel", IDS_PLUGIN_TAB_LABEL}, |
- {"plugins_header", IDS_PLUGIN_HEADER}, |
+ {"pluginsHeader", IDS_PLUGIN_HEADER}, |
{"pluginsAllow", IDS_PLUGIN_ALLOW_RADIO}, |
{"pluginsDetect", IDS_PLUGIN_DETECT_RADIO}, |
{"pluginsBlock", IDS_PLUGIN_BLOCK_RADIO}, |
{"manageIndividualPlugins", IDS_PLUGIN_MANAGE_INDIVIDUAL}, |
// Pop-ups filter. |
{"popupsTabLabel", IDS_POPUP_TAB_LABEL}, |
- {"popups_header", IDS_POPUP_HEADER}, |
+ {"popupsHeader", 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}, |
+ {"locationHeader", 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}, |
+ {"setBy", IDS_GEOLOCATION_SET_BY_HOVER}, |
// Notifications filter. |
{"notificationsTabLabel", IDS_NOTIFICATIONS_TAB_LABEL}, |
- {"notifications_header", IDS_NOTIFICATIONS_HEADER}, |
+ {"notificationsHeader", 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}, |
+ {"fullscreenHeader", IDS_FULLSCREEN_HEADER}, |
// Mouse Lock filter. |
{"mouselockTabLabel", IDS_MOUSE_LOCK_TAB_LABEL}, |
- {"mouselock_header", IDS_MOUSE_LOCK_HEADER}, |
+ {"mouselockHeader", IDS_MOUSE_LOCK_HEADER}, |
{"mouselockAllow", IDS_MOUSE_LOCK_ALLOW_RADIO}, |
{"mouselockAsk", IDS_MOUSE_LOCK_ASK_RADIO}, |
{"mouselockBlock", IDS_MOUSE_LOCK_BLOCK_RADIO}, |
@@ -355,11 +354,11 @@ void ContentSettingsHandler::GetLocalizedValues( |
{"protectedContentTabLabel", IDS_PROTECTED_CONTENT_TAB_LABEL}, |
{"protectedContentInfo", IDS_PROTECTED_CONTENT_INFO}, |
{"protectedContentEnable", IDS_PROTECTED_CONTENT_ENABLE}, |
- {"protectedContent_header", IDS_PROTECTED_CONTENT_HEADER}, |
+ {"protectedContentHeader", 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}, |
+ {"mediaStreamHeader", IDS_MEDIA_STREAM_HEADER}, |
{"mediaStreamAsk", IDS_MEDIA_STREAM_ASK_RADIO}, |
{"mediaStreamBlock", IDS_MEDIA_STREAM_BLOCK_RADIO}, |
{"mediaStreamAudioAsk", IDS_MEDIA_STREAM_ASK_AUDIO_ONLY_RADIO}, |
@@ -378,28 +377,28 @@ void ContentSettingsHandler::GetLocalizedValues( |
{"mediaPepperFlashGlobalPrivacyURL", IDS_FLASH_GLOBAL_PRIVACY_URL}, |
{"mediaPepperFlashWebsitePrivacyURL", IDS_FLASH_WEBSITE_PRIVACY_URL}, |
// PPAPI broker filter. |
- {"ppapi-broker_header", IDS_PPAPI_BROKER_HEADER}, |
+ {"ppapiBrokerHeader", 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}, |
+ {"multipleAutomaticDownloadsHeader", 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}, |
+ {"midiSysexHeader", 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}, |
+ {"pushMessagingHeader", 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}, |
+ {"zoomlevelsHeader", IDS_ZOOMLEVELS_HEADER_AND_TAB_LABEL}, |
{"zoomLevelsManage", IDS_ZOOMLEVELS_MANAGE_BUTTON}, |
}; |