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 6b8ed61c2bcb354abed702d9aa9dbd8b7b8b562f..9ad4a73b4bd2a7abb9e3af3bb89424b7be72ffab 100644 |
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc |
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc |
@@ -547,9 +547,6 @@ void ContentSettingsHandler::GetLocalizedValues( |
{"mouselockTabLabel", IDS_MOUSE_LOCK_TAB_LABEL}, |
{"mouselockHeader", IDS_MOUSE_LOCK_HEADER}, |
{"mouselockDeprecated", IDS_EXCLUSIVE_ACCESS_DEPRECATED}, |
- {"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}, |
@@ -755,16 +752,6 @@ void ContentSettingsHandler::InitializePage() { |
UpdateAllExceptionsViewsFromModel(); |
UpdateAllChooserExceptionsViewsFromModel(); |
UpdateProtectedContentExceptionsButton(); |
- |
- // Fullscreen and mouselock settings are ignored, but still stored. Always |
- // show the per-site settings (to give users the ability to view and delete |
- // exceptions), but hide the global settings. |
- // TODO(mgiuca): Remove this function and the global setting UI |
- // (https://crbug.com/610900). Then, delete all the per-site data and remove |
- // this content setting entirely (https://crbug.com/591896). |
- web_ui()->CallJavascriptFunction("ContentSettings.setExclusiveAccessVisible", |
- base::FundamentalValue(true), |
- base::FundamentalValue(false)); |
} |
void ContentSettingsHandler::OnContentSettingChanged( |