Remove (already-hidden) global fullscreen / mouselock settings.

chrome/browser/ui/webui/options/content_settings_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options/content_settings_handler.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
@@ skipping 488 matching lines @@
     {"notificationsAsk", IDS_NOTIFICATIONS_ASK_RADIO},
     {"notificationsBlock", IDS_NOTIFICATIONS_BLOCK_RADIO},
     // Fullscreen filter.
     {"fullscreenTabLabel", IDS_FULLSCREEN_TAB_LABEL},
     {"fullscreenHeader", IDS_FULLSCREEN_HEADER},
     {"fullscreenDeprecated", IDS_EXCLUSIVE_ACCESS_DEPRECATED},
     // Mouse Lock filter.
     {"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},
     {"protectedContentInfo", IDS_PROTECTED_CONTENT_INFO},
     {"protectedContentEnable", IDS_PROTECTED_CONTENT_ENABLE},
     {"protectedContentHeader", IDS_PROTECTED_CONTENT_HEADER},
 #endif  // defined(OS_CHROMEOS) || defined(OS_WIN)
     // Microphone filter.
     {"mediaStreamMicTabLabel", IDS_MEDIA_STREAM_MIC_TAB_LABEL},
     {"mediaStreamMicHeader", IDS_MEDIA_STREAM_MIC_HEADER},
@@ skipping 185 matching lines @@
 }
 
 void ContentSettingsHandler::InitializePage() {
   media_settings_.reset(new MediaSettingsInfo());
   RefreshFlashMediaSettings();
 
   UpdateHandlersEnabledRadios();
   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()->CallJavascriptFunctionUnsafe(
-      "ContentSettings.setExclusiveAccessVisible", base::FundamentalValue(true),
-      base::FundamentalValue(false));
 }
 
 void ContentSettingsHandler::OnContentSettingChanged(
     const ContentSettingsPattern& primary_pattern,
     const ContentSettingsPattern& secondary_pattern,
     ContentSettingsType content_type,
     std::string resource_identifier) {
   const ContentSettingsDetails details(
       primary_pattern, secondary_pattern, content_type, resource_identifier);
   // TODO(estade): we pretend update_all() is always true.
@@ skipping 430 matching lines @@
   site_settings::GetExceptionsFromHostContentSettingsMap(
       GetContentSettingsMap(), type, web_ui(), &exceptions);
   base::StringValue type_string(
       site_settings::ContentSettingsTypeToGroupName(type));
   web_ui()->CallJavascriptFunctionUnsafe("ContentSettings.setExceptions",
 
                                          type_string, exceptions);
 
   UpdateExceptionsViewFromOTRHostContentSettingsMap(type);
 
-  // TODO(koz): The default for fullscreen is always 'ask'.
-  // http://crbug.com/104683
-  if (type == CONTENT_SETTINGS_TYPE_FULLSCREEN)
+  // Fullscreen and mouse lock have no global settings to update.
+  // TODO(mgiuca): Delete this after removing these content settings entirely
+  // (https://crbug.com/591896).
+  if (type == CONTENT_SETTINGS_TYPE_FULLSCREEN ||
+      type == CONTENT_SETTINGS_TYPE_MOUSELOCK) {
     return;
+  }
 
 #if defined(OS_CHROMEOS)
   // Also the default for protected contents is managed in another place.
   if (type == CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER)
     return;
 #endif
 
   // 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);
@@ skipping 464 matching lines @@
 
   // Exceptions apply only when the feature is enabled.
   PrefService* prefs = user_prefs::UserPrefs::Get(GetBrowserContext(web_ui()));
   bool enable_exceptions = prefs->GetBoolean(prefs::kEnableDRM);
   web_ui()->CallJavascriptFunctionUnsafe(
       "ContentSettings.enableProtectedContentExceptions",
       base::FundamentalValue(enable_exceptions));
 }
 
 }  // namespace options