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

chrome/browser/ui/exclusive_access/fullscreen_controller.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/exclusive_access/fullscreen_controller.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 459 matching lines @@
   // state_prior_to_tab_fullscreen_ will be incorrect.
   NotifyTabExclusiveAccessLost();
 #endif
   exclusive_access_manager()->context()->ExitFullscreen();
   extension_caused_fullscreen_ = GURL();
 
   exclusive_access_manager()->UpdateExclusiveAccessExitBubbleContent();
 }
 
 ContentSetting FullscreenController::GetFullscreenSetting() const {
-  DCHECK(exclusive_access_tab());
-
-  // If simplified UI is enabled, never ask the user, just auto-allow.
-  // TODO(mgiuca): Should we allow the user to block use of fullscreen?
-  // http://crbug.com/515747.
-  if (ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled())
-    return CONTENT_SETTING_ALLOW;
-
-  GURL url = GetRequestingOrigin();
-
-  // 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 (IsPrivilegedFullscreenForTab())
-    return CONTENT_SETTING_ALLOW;
-
-  // If the permission was granted to the website with no embedder, it should
-  // always be allowed, even if embedded.
-  if (HostContentSettingsMapFactory::GetForProfile(
-        exclusive_access_manager()->context()->GetProfile())
-            ->GetContentSetting(url, url, CONTENT_SETTINGS_TYPE_FULLSCREEN,
-                                std::string()) == CONTENT_SETTING_ALLOW) {
-    return CONTENT_SETTING_ALLOW;
-  }
-
-  // See the comment above the call to |SetContentSettingDefaultScope()| for how
-  // the requesting and embedding origins interact with each other wrt
-  // permissions.
-  return HostContentSettingsMapFactory::GetForProfile(
-      exclusive_access_manager()->context()->GetProfile())
-          ->GetContentSetting(url, GetEmbeddingOrigin(),
-                              CONTENT_SETTINGS_TYPE_FULLSCREEN, std::string());
+  // The new policy is to always allow (even if the flag is disabled).
+  // TODO(mgiuca): Remove this function and clean up callers
+  // (https://crbug.com/610900).
+  return CONTENT_SETTING_ALLOW;
 }
 
 bool FullscreenController::IsPrivilegedFullscreenForTab() const {
   const bool embedded_widget_present =
       exclusive_access_tab() &&
       exclusive_access_tab()->GetFullscreenRenderWidgetHostView();
   return embedded_widget_present || is_privileged_fullscreen_for_testing_;
 }
 
 void FullscreenController::SetPrivilegedFullscreenForTesting(
@@ skipping 42 matching lines @@
     return fullscreened_origin_;
 
   return exclusive_access_tab()->GetLastCommittedURL();
 }
 
 GURL FullscreenController::GetEmbeddingOrigin() const {
   DCHECK(exclusive_access_tab());
 
   return exclusive_access_tab()->GetLastCommittedURL();
 }