Delete unused code for exclusive access permission prompting.

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 33 matching lines @@
 namespace {
 
 const char kBubbleReshowsHistogramName[] =
     "ExclusiveAccess.BubbleReshowsPerSession.Fullscreen";
 
 }  // namespace
 
 FullscreenController::FullscreenController(ExclusiveAccessManager* manager)
     : ExclusiveAccessControllerBase(manager),
       state_prior_to_tab_fullscreen_(STATE_INVALID),
-      tab_fullscreen_accepted_(false),
+      tab_fullscreen_(false),
       toggled_into_fullscreen_(false),
       reentrant_window_state_change_call_check_(false),
       is_privileged_fullscreen_for_testing_(false),
       ptr_factory_(this) {
 }
 
 FullscreenController::~FullscreenController() {
 }
 
 bool FullscreenController::IsFullscreenForBrowser() const {
@@ skipping 23 matching lines @@
 }
 
 bool FullscreenController::IsExtensionFullscreenOrPending() const {
   return !extension_caused_fullscreen_.is_empty();
 }
 
 bool FullscreenController::IsControllerInitiatedFullscreen() const {
   return toggled_into_fullscreen_;
 }
 
-bool FullscreenController::IsUserAcceptedFullscreen() const {
-  return tab_fullscreen_accepted_;
+bool FullscreenController::IsTabFullscreen() const {
+  return tab_fullscreen_;
 }
 
 bool FullscreenController::IsFullscreenForTabOrPending(
     const WebContents* web_contents) const {
   if (IsFullscreenForCapturedTab(web_contents))
     return true;
   if (web_contents == exclusive_access_tab()) {
     DCHECK(web_contents ==
            exclusive_access_manager()->context()->GetActiveWebContents());
     return true;
@@ skipping 38 matching lines @@
     // Browser Fullscreen with Toolbar -> Tab Fullscreen (no toolbar).
     exclusive_access_context->UpdateFullscreenWithToolbar(false);
     state_prior_to_tab_fullscreen_ = STATE_BROWSER_FULLSCREEN_WITH_TOOLBAR;
   } else {
     // Browser Fullscreen without Toolbar -> Tab Fullscreen.
     state_prior_to_tab_fullscreen_ = STATE_BROWSER_FULLSCREEN_NO_TOOLBAR;
   }
 
   // We need to update the fullscreen exit bubble, e.g., going from browser
   // fullscreen to tab fullscreen will need to show different content.
-  if (!tab_fullscreen_accepted_) {
-    tab_fullscreen_accepted_ = GetFullscreenSetting() == CONTENT_SETTING_ALLOW;
-  }
+  tab_fullscreen_ = true;
   exclusive_access_manager()->UpdateExclusiveAccessExitBubbleContent();
 
   // This is only a change between Browser and Tab fullscreen. We generate
   // a fullscreen notification now because there is no window change.
   PostFullscreenChangeNotification(true);
 }
 
 void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
   if (MaybeToggleFullscreenForCapturedTab(web_contents, false)) {
     // During tab capture of fullscreen-within-tab views, the browser window
@@ skipping 114 matching lines @@
   return true;
 }
 
 void FullscreenController::ExitExclusiveAccessToPreviousState() {
   if (IsWindowFullscreenForTabOrPending())
     ExitFullscreenModeForTab(exclusive_access_tab());
   else if (IsFullscreenForBrowser())
     ExitFullscreenModeInternal();
 }
 
-bool FullscreenController::OnAcceptExclusiveAccessPermission() {
-  ExclusiveAccessBubbleType bubble_type =
-      exclusive_access_manager()->GetExclusiveAccessExitBubbleType();
-  bool fullscreen = false;
-  exclusive_access_bubble::PermissionRequestedByType(bubble_type, &fullscreen,
-                                                     nullptr);
-  DCHECK(!(fullscreen && tab_fullscreen_accepted_));
-
-  if (fullscreen && !tab_fullscreen_accepted_) {
-    DCHECK(exclusive_access_tab());
-    // Origins can enter fullscreen even when embedded in other origins.
-    // Permission is tracked based on the combinations of requester and
-    // embedder. Thus, even if a requesting origin has been previously approved
-    // for embedder A, it will not be approved when embedded in a different
-    // origin B.
-    //
-    // However, an exception is made when a requester and an embedder are the
-    // same origin. In other words, if the requester is the top-level frame. If
-    // that combination is ALLOWED, then future requests from that origin will
-    // succeed no matter what the embedder is. For example, if youtube.com
-    // is visited and user selects ALLOW. Later user visits example.com which
-    // embeds youtube.com in an iframe, which is then ALLOWED to go fullscreen.
-    GURL requester = GetRequestingOrigin();
-    GURL embedder = GetEmbeddingOrigin();
-
-    // Do not store preference on file:// URLs, they don't have a clean
-    // origin policy.
-    // TODO(estark): Revisit this when crbug.com/455882 is fixed.
-    if (!requester.SchemeIsFile() && !embedder.SchemeIsFile()) {
-      HostContentSettingsMap* settings_map =
-          HostContentSettingsMapFactory::GetForProfile(
-              exclusive_access_manager()->context()->GetProfile());
-      settings_map->SetContentSettingDefaultScope(
-          requester, embedder, CONTENT_SETTINGS_TYPE_FULLSCREEN, std::string(),
-          CONTENT_SETTING_ALLOW);
-    }
-    tab_fullscreen_accepted_ = true;
-    return true;
-  }
-
-  return false;
-}
-
-bool FullscreenController::OnDenyExclusiveAccessPermission() {
-  if (IsWindowFullscreenForTabOrPending()) {
-    ExitExclusiveAccessIfNecessary();
-    return true;
-  }
-
-  return false;
-}
-
 GURL FullscreenController::GetURLForExclusiveAccessBubble() const {
   if (exclusive_access_tab())
     return GetRequestingOrigin();
   return extension_caused_fullscreen_;
 }
 
 void FullscreenController::ExitExclusiveAccessIfNecessary() {
   if (IsWindowFullscreenForTabOrPending())
     ExitFullscreenModeForTab(exclusive_access_tab());
   else
@@ skipping 14 matching lines @@
       content::Details<bool>(&is_fullscreen));
 }
 
 void FullscreenController::NotifyTabExclusiveAccessLost() {
   if (exclusive_access_tab()) {
     WebContents* web_contents = exclusive_access_tab();
     SetTabWithExclusiveAccess(nullptr);
     fullscreened_origin_ = GURL();
     bool will_cause_resize = IsFullscreenCausedByTab();
     state_prior_to_tab_fullscreen_ = STATE_INVALID;
-    tab_fullscreen_accepted_ = false;
+    tab_fullscreen_ = false;
     web_contents->ExitFullscreen(will_cause_resize);
     exclusive_access_manager()->UpdateExclusiveAccessExitBubbleContent();
   }
 }
 
 void FullscreenController::RecordBubbleReshowsHistogram(
     int bubble_reshow_count) {
   UMA_HISTOGRAM_COUNTS_100(kBubbleReshowsHistogramName, bubble_reshow_count);
 }
 
@@ skipping 39 matching lines @@
   else
     ExitFullscreenModeInternal();
 }
 
 void FullscreenController::EnterFullscreenModeInternal(
     FullscreenInternalOption option) {
   toggled_into_fullscreen_ = true;
   GURL url;
   if (option == TAB) {
     url = GetRequestingOrigin();
-    tab_fullscreen_accepted_ = GetFullscreenSetting() == CONTENT_SETTING_ALLOW;
+    tab_fullscreen_ = true;
   } else {
     if (!extension_caused_fullscreen_.is_empty())
       url = extension_caused_fullscreen_;
   }
 
   if (option == BROWSER)
     content::RecordAction(UserMetricsAction("ToggleFullscreen"));
   // TODO(scheib): Record metrics for WITH_TOOLBAR, without counting transitions
   // from tab fullscreen out to browser with toolbar.
 
@@ skipping 17 matching lines @@
   // state_prior_to_tab_fullscreen_ to match them else other logic using
   // 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 {
-  // 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(
     bool is_privileged) {
   is_privileged_fullscreen_for_testing_ = is_privileged;
@@ skipping 40 matching lines @@
     return fullscreened_origin_;
 
   return exclusive_access_tab()->GetLastCommittedURL();
 }
 
 GURL FullscreenController::GetEmbeddingOrigin() const {
   DCHECK(exclusive_access_tab());
 
   return exclusive_access_tab()->GetLastCommittedURL();
 }