Deleted CONTENT_SETTINGS_TYPE_FULLSCREEN and MOUSELOCK.

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 <map>
@@ skipping 125 matching lines @@
             UserMetricsAction("Options_DefaultJavaScriptSettingChanged"))));
     exceptions_info_map.insert(std::make_pair(
         CONTENT_SETTINGS_TYPE_PLUGINS,
         ContentSettingWithExceptions(
             true, UserMetricsAction("Options_DefaultPluginsSettingChanged"))));
     exceptions_info_map.insert(std::make_pair(
         CONTENT_SETTINGS_TYPE_POPUPS,
         ContentSettingWithExceptions(
             true, UserMetricsAction("Options_DefaultPopupsSettingChanged"))));
     exceptions_info_map.insert(std::make_pair(
-        CONTENT_SETTINGS_TYPE_FULLSCREEN,
-        ContentSettingWithExceptions(
-            true,
-            UserMetricsAction("Options_DefaultFullScreenSettingChanged"))));
-    exceptions_info_map.insert(std::make_pair(
-        CONTENT_SETTINGS_TYPE_MOUSELOCK,
-        ContentSettingWithExceptions(
-            true,
-            UserMetricsAction("Options_DefaultMouseLockSettingChanged"))));
-    exceptions_info_map.insert(std::make_pair(
         CONTENT_SETTINGS_TYPE_PPAPI_BROKER,
         ContentSettingWithExceptions(
             true,
             UserMetricsAction("Options_DefaultPPAPIBrokerSettingChanged"))));
 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
     exceptions_info_map.insert(std::make_pair(
         CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
         ContentSettingWithExceptions(
             true,
             UserMetricsAction(
@@ skipping 923 matching lines @@
     zoom_levels_exceptions.Append(std::move(exception));
   }
 
   base::StringValue type_string(kZoomContentType);
   web_ui()->CallJavascriptFunctionUnsafe("ContentSettings.setExceptions",
                                          type_string, zoom_levels_exceptions);
 }
 
 void ContentSettingsHandler::UpdateExceptionsViewFromHostContentSettingsMap(
     ContentSettingsType type) {
-  // 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;
-  }
-
   base::ListValue exceptions;
   HostContentSettingsMap* settings_map =
       HostContentSettingsMapFactory::GetForProfile(GetProfile());
   site_settings::GetExceptionsFromHostContentSettingsMap(settings_map, type,
       web_ui(), /*incognito=*/false, /*filter=*/nullptr, &exceptions);
   base::StringValue type_string(
       site_settings::ContentSettingsTypeToGroupName(type));
   web_ui()->CallJavascriptFunctionUnsafe("ContentSettings.setExceptions",
                                          type_string, exceptions);
 
@@ skipping 393 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