Delete unused code for exclusive access permission prompting.

chrome/browser/ui/exclusive_access/exclusive_access_manager.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/exclusive_access_manager.h"
 
 #include "base/command_line.h"
 #include "build/build_config.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 29 matching lines @@
 
 ExclusiveAccessBubbleType
 ExclusiveAccessManager::GetExclusiveAccessExitBubbleType() const {
   // In kiosk and exclusive app mode we always want to be fullscreen and do not
   // want to show exit instructions for browser mode fullscreen.
   bool app_mode = false;
 #if !defined(OS_MACOSX)  // App mode (kiosk) is not available on Mac yet.
   app_mode = chrome::IsRunningInAppMode();
 #endif
 
-  if (mouse_lock_controller_.IsMouseLockSilentlyAccepted() &&
+  if (mouse_lock_controller_.IsMouseLockedSilently() &&
       (!fullscreen_controller_.IsWindowFullscreenForTabOrPending() ||
-       fullscreen_controller_.IsUserAcceptedFullscreen()))
+       fullscreen_controller_.IsTabFullscreen()))
     return EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE;
 
   if (!fullscreen_controller_.IsWindowFullscreenForTabOrPending()) {
     if (mouse_lock_controller_.IsMouseLocked())
       return EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_EXIT_INSTRUCTION;
-    if (mouse_lock_controller_.IsMouseLockRequested())
-      return EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_BUTTONS;
     if (fullscreen_controller_.IsExtensionFullscreenOrPending())
       return EXCLUSIVE_ACCESS_BUBBLE_TYPE_EXTENSION_FULLSCREEN_EXIT_INSTRUCTION;
     if (fullscreen_controller_.IsControllerInitiatedFullscreen() && !app_mode)
       return EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION;
     return EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE;
   }
 
-  if (fullscreen_controller_.IsUserAcceptedFullscreen()) {
+  if (fullscreen_controller_.IsTabFullscreen()) {
     if (fullscreen_controller_.IsPrivilegedFullscreenForTab())
       return EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE;
     if (IsExperimentalKeyboardLockUIEnabled())
       return EXCLUSIVE_ACCESS_BUBBLE_TYPE_KEYBOARD_LOCK_EXIT_INSTRUCTION;
     if (mouse_lock_controller_.IsMouseLocked())
       return EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_EXIT_INSTRUCTION;
-    if (mouse_lock_controller_.IsMouseLockRequested())
-      return EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_BUTTONS;
     return EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_EXIT_INSTRUCTION;
   }
 
-  if (mouse_lock_controller_.IsMouseLockRequested())
-    return EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS;
-  return EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_BUTTONS;
+  return EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_EXIT_INSTRUCTION;
 }
 
 void ExclusiveAccessManager::UpdateExclusiveAccessExitBubbleContent() {
   GURL url = GetExclusiveAccessBubbleURL();
   ExclusiveAccessBubbleType bubble_type = GetExclusiveAccessExitBubbleType();
 
-  // If bubble displays buttons, unlock mouse to allow pressing them.
-  if (exclusive_access_bubble::ShowButtonsForType(bubble_type) &&
-      mouse_lock_controller_.IsMouseLocked())
-    mouse_lock_controller_.UnlockMouse();
-
   exclusive_access_context_->UpdateExclusiveAccessExitBubbleContent(
       url, bubble_type);
 }
 
 GURL ExclusiveAccessManager::GetExclusiveAccessBubbleURL() const {
   GURL result = fullscreen_controller_.GetURLForExclusiveAccessBubble();
   if (!result.is_valid())
     result = mouse_lock_controller_.GetURLForExclusiveAccessBubble();
   return result;
 }
@@ skipping 60 matching lines @@
   bool handled = false;
   handled = fullscreen_controller_.HandleUserPressedEscape();
   handled |= mouse_lock_controller_.HandleUserPressedEscape();
   return handled;
 }
 
 void ExclusiveAccessManager::OnUserInput() {
   exclusive_access_context_->OnExclusiveAccessUserInput();
 }
 
-void ExclusiveAccessManager::OnAcceptExclusiveAccessPermission() {
-  bool updateBubble =
-      mouse_lock_controller_.OnAcceptExclusiveAccessPermission();
-  updateBubble |= fullscreen_controller_.OnAcceptExclusiveAccessPermission();
-  if (updateBubble)
-    UpdateExclusiveAccessExitBubbleContent();
-}
-
-void ExclusiveAccessManager::OnDenyExclusiveAccessPermission() {
-  bool updateBubble = mouse_lock_controller_.OnDenyExclusiveAccessPermission();
-  updateBubble |= fullscreen_controller_.OnDenyExclusiveAccessPermission();
-  if (updateBubble)
-    UpdateExclusiveAccessExitBubbleContent();
-}
-
 void ExclusiveAccessManager::ExitExclusiveAccess() {
   fullscreen_controller_.ExitExclusiveAccessToPreviousState();
   mouse_lock_controller_.LostMouseLock();
 }
 
 void ExclusiveAccessManager::RecordBubbleReshownUMA(
     ExclusiveAccessBubbleType type) {
   // Figure out whether each of fullscreen, mouselock is in effect.
   bool fullscreen = false;
   bool mouselock = false;
   switch (type) {
     case EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE:
-    case EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_BUTTONS:
       // None in effect.
       break;
-    case EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_BUTTONS:
     case EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_EXIT_INSTRUCTION:
     case EXCLUSIVE_ACCESS_BUBBLE_TYPE_KEYBOARD_LOCK_EXIT_INSTRUCTION:
     case EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION:
     case EXCLUSIVE_ACCESS_BUBBLE_TYPE_EXTENSION_FULLSCREEN_EXIT_INSTRUCTION:
       // Only fullscreen in effect.
       fullscreen = true;
       break;
     case EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_EXIT_INSTRUCTION:
       // Only mouselock in effect.
       mouselock = true;
       break;
-    case EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS:
     case EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_EXIT_INSTRUCTION:
       // Both in effect.
       fullscreen = true;
       mouselock = true;
       break;
   }
 
   if (fullscreen)
     fullscreen_controller_.RecordBubbleReshownUMA();
   if (mouselock)
     mouse_lock_controller_.RecordBubbleReshownUMA();
 }
 
 void ExclusiveAccessManager::HandleUserHeldEscape() {
   fullscreen_controller_.HandleUserPressedEscape();
   mouse_lock_controller_.HandleUserPressedEscape();
 }