Refactor fullscreen_controller.

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 "chrome/browser/app_mode/app_mode_utils.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
+#include "chrome/browser/ui/exclusive_access/mouse_lock_controller.h"
+
+using content::WebContents;
+
+ExclusiveAccessManager::ExclusiveAccessManager(Browser* browser)
+    : browser_(browser),
+      fullscreen_controller_(this, browser),
+      mouse_lock_controller_(this, browser) {
+}
+
+ExclusiveAccessManager::~ExclusiveAccessManager() {
+}
+
+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())

[scheib, 2015/01/22 22:54:04]

There could be a bug here.
1. Clear content settings allowing fullscreen for site.
2. Enter mouse lock
3. Page exits mouse lock via document.exitPointerLock (NOT by ESC).
   http://scheib.github.io/HTMLMisc/PointerLockAndFullscreen.html
   has "Toggle Pointer Lock" button
4. Page requests fullscreen

Expected (and current on stable): Fullscreen bubble shown.

Risk: Logic elsewhere won't cause that, and IsMouseLockSilentlyAccepted() true
here will have no bubble shown.

Verify manually. Better yet, update this logic so by inspection we're certain we
won't encounter this.
if (mouse_lock_controller_.IsMouseLockSilentlyAccepted() &&
    (!fullscreen_controller_.IsWindowFullscreenForTabOrPending() ||
     fullscreen_controller_.IsUserAcceptedFullscreen()))
    
If making the logic change, verify automated tests and also manually that
pressing Toggle Pointer Lock repeatedly on
http://scheib.github.io/HTMLMisc/PointerLockAndFullscreen.html doesn't show the
bubble (use space bar to press button when in pointer lock).

[Sriram, 2015/01/23 07:13:43]

Great catch and verified that this repros in TOT chrome build as well as with my
change (as both are quite similar modulo where the function is called from). 

The repro steps needs to be updated though:
1. Clear settings
2. Enter mouse lock by accepting prompt.
3. Page exits mouse lock and then re-acquire by clicking "toggle lock".
4. Page requests fullscreen.

Expected: Fullscreen bubble shown but actually none shown. I have fixed this.

[scheib, 2015/01/23 16:42:32]

http://images.clipartpanda.com/teamwork-funny-meme2.jpg

+    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_.IsPrivilegedFullscreenForTab())
+      return EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE;
+    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;
+}
+
+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();
+
+  browser_->window()->UpdateFullscreenExitBubbleContent(url, bubble_type);
+}
+
+GURL ExclusiveAccessManager::GetExclusiveAccessBubbleURL() const {
+  GURL result = fullscreen_controller_.GetURLForExclusiveAccessBubble();
+  if (!result.is_valid())
+    result = mouse_lock_controller_.GetURLForExclusiveAccessBubble();
+  return result;
+}
+
+void ExclusiveAccessManager::OnTabDeactivated(WebContents* web_contents) {
+  fullscreen_controller_.OnTabDeactivated(web_contents);
+  mouse_lock_controller_.OnTabDeactivated(web_contents);
+}
+
+void ExclusiveAccessManager::OnTabDetachedFromView(WebContents* web_contents) {
+  fullscreen_controller_.OnTabDetachedFromView(web_contents);
+  mouse_lock_controller_.OnTabDetachedFromView(web_contents);
+}
+
+void ExclusiveAccessManager::OnTabClosing(WebContents* web_contents) {
+  fullscreen_controller_.OnTabClosing(web_contents);
+  mouse_lock_controller_.OnTabClosing(web_contents);
+}
+
+bool ExclusiveAccessManager::HandleUserPressedEscape() {
+  bool handled = false;
+  handled = fullscreen_controller_.HandleUserPressedEscape();
+  handled |= mouse_lock_controller_.HandleUserPressedEscape();
+  return handled;
+}
+
+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();
+}