Added flag simplified-fullscreen-ui.

chrome/browser/ui/exclusive_access/mouse_lock_controller.cc

Index: chrome/browser/ui/exclusive_access/mouse_lock_controller.cc
diff --git a/chrome/browser/ui/exclusive_access/mouse_lock_controller.cc b/chrome/browser/ui/exclusive_access/mouse_lock_controller.cc
index 8e3afb90779a4eaadb33e7288f7a4f70f62427d8..f6adfac00fb2e7cbcf7041974ed2571c985034e8 100644
--- a/chrome/browser/ui/exclusive_access/mouse_lock_controller.cc
+++ b/chrome/browser/ui/exclusive_access/mouse_lock_controller.cc
@@ -229,10 +229,15 @@ void MouseLockController::UnlockMouse() {
 }
 
 ContentSetting MouseLockController::GetMouseLockSetting(const GURL& url) const {
+  // If simplified UI is enabled, never ask the user, just auto-allow. (Always
+  // return CONTENT_SETTING_ALLOW in favour of CONTENT_SETTING_ASK.)
+  bool simplified_ui =
+      ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled();
+
   // 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())
+  if (url.SchemeIsFile() && !simplified_ui)
     return CONTENT_SETTING_ASK;
 
   if (exclusive_access_manager()
@@ -244,6 +249,11 @@ ContentSetting MouseLockController::GetMouseLockSetting(const GURL& url) const {
                                              ->context()
                                              ->GetProfile()
                                              ->GetHostContentSettingsMap();
-  return settings_map->GetContentSetting(
+  ContentSetting setting = settings_map->GetContentSetting(
       url, url, CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string());
+
+  if (simplified_ui && setting == CONTENT_SETTING_ASK)
+    return CONTENT_SETTING_ALLOW;
+
+  return setting;
 }