Added flag simplified-fullscreen-ui.

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 "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"
@@ skipping 211 matching lines @@
     RenderViewHost* const rvh = exclusive_access_tab()->GetRenderViewHost();
     if (rvh)
       mouse_lock_view = rvh->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. (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()
           ->fullscreen_controller()
           ->IsPrivilegedFullscreenForTab())
     return CONTENT_SETTING_ALLOW;
 
   HostContentSettingsMap* settings_map = exclusive_access_manager()
                                              ->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;
 }