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

chrome/browser/ui/exclusive_access/mouse_lock_controller.cc

 // Copyright (c) 2015 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/exclusive_access/mouse_lock_controller.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 225 matching lines @@
     RenderViewHost* const rvh = exclusive_access_tab()->GetRenderViewHost();
     if (rvh)
       mouse_lock_view = rvh->GetWidget()->GetView();
   }
 
   if (mouse_lock_view)
     mouse_lock_view->UnlockMouse();
 }
 
 ContentSetting MouseLockController::GetMouseLockSetting(const GURL& url) const {
-  // If simplified UI is enabled, never ask the user, just auto-allow. We no
+  // The new policy is to always allow (even if the flag is disabled). We no
   // longer give users control over this at the settings level (since it is very
   // easy to escape mouse lock when it happens). Even if the user has blocked
   // access to this site in the past, we now ignore that setting.
-  if (ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled())
-    return CONTENT_SETTING_ALLOW;
-
-  // Always ask on file:// URLs, since we can't meaningfully make the
-  // decision stick for a particular origin.
-  // TODO(estark): Revisit this when crbug.com/455882 is fixed.
-  if (url.SchemeIsFile())
-    return CONTENT_SETTING_ASK;
-
-  if (exclusive_access_manager()
-          ->fullscreen_controller()
-          ->IsPrivilegedFullscreenForTab())
-    return CONTENT_SETTING_ALLOW;
-
-  HostContentSettingsMap* settings_map =
-      HostContentSettingsMapFactory::GetForProfile(
-          exclusive_access_manager()->context()->GetProfile());
-  ContentSetting setting = settings_map->GetContentSetting(
-      url, url, CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string());
-
-  return setting;
+  // TODO(mgiuca): Remove this function and clean up callers
+  // (https://crbug.com/610900).
+  return CONTENT_SETTING_ALLOW;
 }