Fullscreen / mouselock: Always auto-accept (even if flag disabled).

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 738 matching lines @@
 
 void ContentSettingsHandler::InitializePage() {
   media_settings_.reset(new MediaSettingsInfo());
   RefreshFlashMediaSettings();
 
   UpdateHandlersEnabledRadios();
   UpdateAllExceptionsViewsFromModel();
   UpdateAllChooserExceptionsViewsFromModel();
   UpdateProtectedContentExceptionsButton();
 
-  // In simplified fullscreen mode, fullscreen and mouselock settings are
-  // ignored. Still, always show these settings (to give users the ability to
-  // view and delete exceptions), but hide the global settings.
-  bool hide_settings =
-      ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled();
+  // 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(hide_settings),
-                                   base::FundamentalValue(!hide_settings));
+                                   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 928 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()->CallJavascriptFunction(
       "ContentSettings.enableProtectedContentExceptions",
       base::FundamentalValue(enable_exceptions));
 }
 
 }  // namespace options