Refactor fullscreen_controller.

chrome/browser/ui/exclusive_access/mouse_lock_controller.cc

Index: chrome/browser/ui/exclusive_access/mouse_lock_controller.cc
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc b/chrome/browser/ui/exclusive_access/mouse_lock_controller.cc
similarity index 13%
copy from chrome/browser/ui/exclusive_access/fullscreen_controller.cc
copy to chrome/browser/ui/exclusive_access/mouse_lock_controller.cc
index 66554695eb72c1e0aeca33cddb3bf88a3a19321f..7430dc20e511437734d4a27ac4c15113e860f167 100644
--- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
+++ b/chrome/browser/ui/exclusive_access/mouse_lock_controller.cc
@@ -1,225 +1,44 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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/fullscreen_controller.h"
+#include "chrome/browser/ui/exclusive_access/mouse_lock_controller.h"
 
-#include "base/bind.h"
-#include "base/command_line.h"
-#include "base/message_loop/message_loop.h"
-#include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.h"
-#include "chrome/browser/ui/status_bubble.h"
-#include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/browser/ui/web_contents_sizer.h"
-#include "chrome/common/chrome_switches.h"
+#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
-#include "content/public/browser/navigation_details.h"
-#include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
-#include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
-#include "extensions/common/extension.h"
-
-#if !defined(OS_MACOSX)
-#include "base/prefs/pref_service.h"
-#include "chrome/common/pref_names.h"
-#endif
 
-using base::UserMetricsAction;
 using content::RenderViewHost;
 using content::WebContents;
 
-FullscreenController::FullscreenController(Browser* browser)
-    : browser_(browser),
-      window_(browser->window()),
-      profile_(browser->profile()),
-      fullscreened_tab_(NULL),
-      state_prior_to_tab_fullscreen_(STATE_INVALID),
-      tab_fullscreen_accepted_(false),
-      toggled_into_fullscreen_(false),
-      mouse_lock_tab_(NULL),
-      mouse_lock_state_(MOUSELOCK_NOT_REQUESTED),
-      reentrant_window_state_change_call_check_(false),
-      is_privileged_fullscreen_for_testing_(false),
-      ptr_factory_(this) {
-  DCHECK(window_);
-  DCHECK(profile_);
-}
-
-FullscreenController::~FullscreenController() {
-}
-
-bool FullscreenController::IsFullscreenForBrowser() const {
-  return window_->IsFullscreen() && !IsFullscreenCausedByTab();
-}
-
-void FullscreenController::ToggleBrowserFullscreenMode() {
-  extension_caused_fullscreen_ = GURL();
-  ToggleFullscreenModeInternal(BROWSER);
-}
-
-void FullscreenController::ToggleBrowserFullscreenWithToolbar() {
-  ToggleFullscreenModeInternal(BROWSER_WITH_TOOLBAR);
-}
-
-void FullscreenController::ToggleBrowserFullscreenModeWithExtension(
-    const GURL& extension_url) {
-  // |extension_caused_fullscreen_| will be reset if this causes fullscreen to
-  // exit.
-  extension_caused_fullscreen_ = extension_url;
-  ToggleFullscreenModeInternal(BROWSER);
-}
-
-bool FullscreenController::IsWindowFullscreenForTabOrPending() const {
-  return fullscreened_tab_ != NULL;
-}
-
-bool FullscreenController::IsFullscreenForTabOrPending(
-    const WebContents* web_contents) const {
-  if (web_contents == fullscreened_tab_) {
-    DCHECK(web_contents == browser_->tab_strip_model()->GetActiveWebContents());
-    DCHECK(web_contents->GetCapturerCount() == 0);
-    return true;
-  }
-  return IsFullscreenForCapturedTab(web_contents);
-}
-
-bool FullscreenController::IsFullscreenCausedByTab() const {
-  return state_prior_to_tab_fullscreen_ == STATE_NORMAL;
-}
-
-void FullscreenController::ToggleFullscreenModeForTab(WebContents* web_contents,
-                                                      bool enter_fullscreen) {
-  if (MaybeToggleFullscreenForCapturedTab(web_contents, enter_fullscreen)) {
-    // During tab capture of fullscreen-within-tab views, the browser window
-    // fullscreen state is unchanged, so return now.
-    return;
-  }
-  if (fullscreened_tab_) {
-    if (web_contents != fullscreened_tab_)
-      return;
-  } else if (
-      web_contents != browser_->tab_strip_model()->GetActiveWebContents()) {
-    return;
-  }
-  if (IsWindowFullscreenForTabOrPending() == enter_fullscreen)
-    return;
-
-#if defined(OS_WIN)
-  // For now, avoid breaking when initiating full screen tab mode while in
-  // a metro snap.
-  // TODO(robertshield): Find a way to reconcile tab-initiated fullscreen
-  //                     modes with metro snap.
-  if (IsInMetroSnapMode())
-    return;
-#endif
-
-  bool in_browser_or_tab_fullscreen_mode = window_->IsFullscreen();
-
-  if (enter_fullscreen) {
-    SetFullscreenedTab(web_contents);
-    if (!in_browser_or_tab_fullscreen_mode) {
-      // Normal -> Tab Fullscreen.
-      state_prior_to_tab_fullscreen_ = STATE_NORMAL;
-      ToggleFullscreenModeInternal(TAB);
-    } else {
-      if (window_->IsFullscreenWithToolbar()) {
-        // Browser Fullscreen with Toolbar -> Tab Fullscreen (no toolbar).
-        window_->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.
-      const GURL& url = web_contents->GetURL();
-      if (!tab_fullscreen_accepted_) {
-        tab_fullscreen_accepted_ =
-            GetFullscreenSetting(url) == CONTENT_SETTING_ALLOW;
-      }
-      UpdateFullscreenExitBubbleContent();
-
-      // This is only a change between Browser and Tab fullscreen. We generate
-      // a fullscreen notification now because there is no window change.
-      PostFullscreenChangeNotification(true);
-    }
-  } else {
-    if (in_browser_or_tab_fullscreen_mode) {
-      if (IsFullscreenCausedByTab()) {
-        // Tab Fullscreen -> Normal.
-        ToggleFullscreenModeInternal(TAB);
-      } else {
-        // Tab Fullscreen -> Browser Fullscreen (with or without toolbar).
-        if (state_prior_to_tab_fullscreen_ ==
-            STATE_BROWSER_FULLSCREEN_WITH_TOOLBAR) {
-          // Tab Fullscreen (no toolbar) -> Browser Fullscreen with Toolbar.
-          window_->UpdateFullscreenWithToolbar(true);
-        }
-
-#if defined(OS_MACOSX)
-        // Clear the bubble URL, which forces the Mac UI to redraw.
-        UpdateFullscreenExitBubbleContent();
-#endif  // defined(OS_MACOSX)
-
-        // If currently there is a tab in "tab fullscreen" mode and fullscreen
-        // was not caused by it (i.e., previously it was in "browser fullscreen"
-        // mode), we need to switch back to "browser fullscreen" mode. In this
-        // case, all we have to do is notifying the tab that it has exited "tab
-        // fullscreen" mode.
-        NotifyTabOfExitIfNecessary();
-
-        // This is only a change between Browser and Tab fullscreen. We generate
-        // a fullscreen notification now because there is no window change.
-        PostFullscreenChangeNotification(true);
-      }
-    }
-  }
+MouseLockController::MouseLockController(
+    ExclusiveAccessControllerManager* manager,
+    Browser* browser)
+    : ExclusiveAccessControllerBase(manager, browser),
+      mouse_lock_state_(MOUSELOCK_NOT_REQUESTED) {
 }
 
-bool FullscreenController::IsInMetroSnapMode() {
-#if defined(OS_WIN)
-  return window_->IsInMetroSnapMode();
-#else
-  return false;
-#endif
+MouseLockController::~MouseLockController() {
 }
 
-#if defined(OS_WIN)
-void FullscreenController::SetMetroSnapMode(bool enable) {
-  reentrant_window_state_change_call_check_ = false;
-
-  toggled_into_fullscreen_ = false;
-  window_->SetMetroSnapMode(enable);
-
-  // FullscreenController unit tests for metro snap assume that on Windows calls
-  // to WindowFullscreenStateChanged are reentrant. If that assumption is
-  // invalidated, the tests must be updated to maintain coverage.
-  CHECK(reentrant_window_state_change_call_check_);
-}
-#endif  // defined(OS_WIN)
-
-bool FullscreenController::IsMouseLockRequested() const {
-  return mouse_lock_state_ == MOUSELOCK_REQUESTED;
-}
-
-bool FullscreenController::IsMouseLocked() const {
+bool MouseLockController::IsMouseLocked() const {
   return mouse_lock_state_ == MOUSELOCK_ACCEPTED ||
          mouse_lock_state_ == MOUSELOCK_ACCEPTED_SILENTLY;
 }
 
-void FullscreenController::RequestToLockMouse(WebContents* web_contents,
-                                              bool user_gesture,
-                                              bool last_unlocked_by_target) {
+bool MouseLockController::IsMouseLockSilentlyAccepted() const {
+  return mouse_lock_state_ == MOUSELOCK_ACCEPTED_SILENTLY;
+}
+
+void MouseLockController::RequestToLockMouse(WebContents* web_contents,
+                                             bool user_gesture,
+                                             bool last_unlocked_by_target) {
   DCHECK(!IsMouseLocked());
   NotifyMouseLockChange();
 
@@ -228,18 +47,21 @@ void FullscreenController::RequestToLockMouse(WebContents* web_contents,
   // (i.e. not the user), or if we're in tab fullscreen (user gesture required
   // for that)
   if (!last_unlocked_by_target && !user_gesture &&
-      !IsFullscreenForTabOrPending(web_contents)) {
+      !GetManager()->GetFullscreenController()->IsFullscreenForTabOrPending(
+          web_contents)) {
     web_contents->GotResponseToLockMouseRequest(false);
     return;
   }
-  SetMouseLockTab(web_contents);
-  ExclusiveAccessBubbleType bubble_type = GetExclusiveAccessBubbleType();
+  SetTabWithExclusiveAccess(web_contents);
+  ExclusiveAccessBubbleType bubble_type = GetExclusiveAccessExitBubbleType();
 
   switch (GetMouseLockSetting(web_contents->GetURL())) {
     case CONTENT_SETTING_ALLOW:
       // If bubble already displaying buttons we must not lock the mouse yet,
       // or it would prevent pressing those buttons. Instead, merge the request.
-      if (!IsPrivilegedFullscreenForTab() &&
+      if (!GetManager()
+               ->GetFullscreenController()
+               ->IsPrivilegedFullscreenForTab() &&
           exclusive_access_bubble::ShowButtonsForType(bubble_type)) {
         mouse_lock_state_ = MOUSELOCK_REQUESTED;
       } else {
@@ -251,14 +73,14 @@ void FullscreenController::RequestToLockMouse(WebContents* web_contents,
             mouse_lock_state_ = MOUSELOCK_ACCEPTED;
           }
         } else {
-          SetMouseLockTab(NULL);
+          SetTabWithExclusiveAccess(nullptr);
           mouse_lock_state_ = MOUSELOCK_NOT_REQUESTED;
         }
       }
       break;
     case CONTENT_SETTING_BLOCK:
       web_contents->GotResponseToLockMouseRequest(false);
-      SetMouseLockTab(NULL);
+      SetTabWithExclusiveAccess(nullptr);
       mouse_lock_state_ = MOUSELOCK_NOT_REQUESTED;
       break;
     case CONTENT_SETTING_ASK:
@@ -267,490 +89,143 @@ void FullscreenController::RequestToLockMouse(WebContents* web_contents,
     default:
       NOTREACHED();
   }
-  UpdateFullscreenExitBubbleContent();
+  UpdateExclusiveAccessExitBubbleContent();
 }
 
-void FullscreenController::OnTabDeactivated(WebContents* web_contents) {
-  if (web_contents == fullscreened_tab_ || web_contents == mouse_lock_tab_)
-    ExitTabFullscreenOrMouseLockIfNecessary();
+void MouseLockController::ExitExclusiveAccessIfNecessary() {
+  NotifyTabOfExclusiveAccessChange();
 }
 
-void FullscreenController::OnTabDetachedFromView(WebContents* old_contents) {
-  if (!IsFullscreenForCapturedTab(old_contents))
-    return;
-
-  // A fullscreen-within-tab view undergoing screen capture has been detached
-  // and is no longer visible to the user. Set it to exactly the WebContents'
-  // preferred size. See 'FullscreenWithinTab Note'.
-  //
-  // When the user later selects the tab to show |old_contents| again, UI code
-  // elsewhere (e.g., views::WebView) will resize the view to fit within the
-  // browser window once again.
-
-  // If the view has been detached from the browser window (e.g., to drag a tab
-  // off into a new browser window), return immediately to avoid an unnecessary
-  // resize.
-  if (!old_contents->GetDelegate())
-    return;
-
-  // Do nothing if tab capture ended after toggling fullscreen, or a preferred
-  // size was never specified by the capturer.
-  if (old_contents->GetCapturerCount() == 0 ||
-      old_contents->GetPreferredSize().IsEmpty()) {
-    return;
-  }
-
-  content::RenderWidgetHostView* const current_fs_view =
-      old_contents->GetFullscreenRenderWidgetHostView();
-  if (current_fs_view)
-    current_fs_view->SetSize(old_contents->GetPreferredSize());
-  ResizeWebContents(old_contents, old_contents->GetPreferredSize());
-}
-
-void FullscreenController::OnTabClosing(WebContents* web_contents) {
-  if (IsFullscreenForCapturedTab(web_contents)) {
-    RenderViewHost* const rvh = web_contents->GetRenderViewHost();
-    if (rvh)
-      rvh->ExitFullscreen();
-  } else if (web_contents == fullscreened_tab_ ||
-             web_contents == mouse_lock_tab_) {
-    ExitTabFullscreenOrMouseLockIfNecessary();
-    // The call to exit fullscreen may result in asynchronous notification of
-    // fullscreen state change (e.g., on Linux). We don't want to rely on it
-    // to call NotifyTabOfExitIfNecessary(), because at that point
-    // |fullscreened_tab_| may not be valid. Instead, we call it here to clean
-    // up tab fullscreen related state.
-    NotifyTabOfExitIfNecessary();
-  }
-}
-
-void FullscreenController::WindowFullscreenStateChanged() {
-  reentrant_window_state_change_call_check_ = true;
-
-  bool exiting_fullscreen = !window_->IsFullscreen();
-
-  PostFullscreenChangeNotification(!exiting_fullscreen);
-  if (exiting_fullscreen) {
-    toggled_into_fullscreen_ = false;
-    extension_caused_fullscreen_ = GURL();
-    NotifyTabOfExitIfNecessary();
-  }
-  if (exiting_fullscreen) {
-    window_->GetDownloadShelf()->Unhide();
-  } else {
-    window_->GetDownloadShelf()->Hide();
-    if (window_->GetStatusBubble())
-      window_->GetStatusBubble()->Hide();
+void MouseLockController::NotifyTabOfExclusiveAccessChange() {
+  WebContents* tab = GetExclusiveAccessTab();
+  if (tab) {
+    if (IsMouseLockRequested()) {
+      tab->GotResponseToLockMouseRequest(false);
+      NotifyMouseLockChange();
+    } else {
+      UnlockMouse();
+    }
+    SetTabWithExclusiveAccess(nullptr);
+    mouse_lock_state_ = MOUSELOCK_NOT_REQUESTED;
+    UpdateExclusiveAccessExitBubbleContent();
   }
 }
 
-bool FullscreenController::HandleUserPressedEscape() {
-  WebContents* const active_web_contents =
-      browser_->tab_strip_model()->GetActiveWebContents();
-  if (IsFullscreenForCapturedTab(active_web_contents)) {
-    RenderViewHost* const rvh = active_web_contents->GetRenderViewHost();
-    if (rvh)
-      rvh->ExitFullscreen();
-    return true;
-  } else if (IsWindowFullscreenForTabOrPending() ||
-             IsMouseLocked() || IsMouseLockRequested()) {
-    ExitTabFullscreenOrMouseLockIfNecessary();
+bool MouseLockController::HandleUserPressedEscape() {
+  if (IsMouseLocked() || IsMouseLockRequested()) {
+    ExitExclusiveAccessIfNecessary();
     return true;
   }
 
   return false;
 }
 
-void FullscreenController::ExitTabOrBrowserFullscreenToPreviousState() {
-  if (IsWindowFullscreenForTabOrPending())
-    ExitTabFullscreenOrMouseLockIfNecessary();
-  else if (IsFullscreenForBrowser())
-    ExitFullscreenModeInternal();
+void MouseLockController::ExitExclusiveAccessToPreviousState() {
+  // Nothing to do for mouse lock.
 }
 
-void FullscreenController::OnAcceptFullscreenPermission() {
-  ExclusiveAccessBubbleType bubble_type = GetExclusiveAccessBubbleType();
+bool MouseLockController::OnAcceptExclusiveAccessPermission() {
+  ExclusiveAccessBubbleType bubble_type = GetExclusiveAccessExitBubbleType();
   bool mouse_lock = false;
-  bool fullscreen = false;
-  exclusive_access_bubble::PermissionRequestedByType(bubble_type, &fullscreen,
+  exclusive_access_bubble::PermissionRequestedByType(bubble_type, nullptr,
                                                      &mouse_lock);
-  DCHECK(!(fullscreen && tab_fullscreen_accepted_));
   DCHECK(!(mouse_lock && IsMouseLocked()));
 
-  HostContentSettingsMap* settings_map = profile_->GetHostContentSettingsMap();
-
-  GURL url = GetFullscreenExitBubbleURL();
-  ContentSettingsPattern pattern = ContentSettingsPattern::FromURL(url);
-
   if (mouse_lock && !IsMouseLocked()) {
     DCHECK(IsMouseLockRequested());
+
+    HostContentSettingsMap* settings_map =
+        GetProfile()->GetHostContentSettingsMap();
+
+    GURL url = GetExclusiveAccessBubbleURL();
+    ContentSettingsPattern pattern = ContentSettingsPattern::FromURL(url);
+
     // TODO(markusheintz): We should allow patterns for all possible URLs here.
     if (pattern.IsValid()) {
-      settings_map->SetContentSetting(
-          pattern, ContentSettingsPattern::Wildcard(),
-          CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string(),
-          CONTENT_SETTING_ALLOW);
+      settings_map->SetContentSetting(pattern,
+                                      ContentSettingsPattern::Wildcard(),
+                                      CONTENT_SETTINGS_TYPE_MOUSELOCK,
+                                      std::string(), CONTENT_SETTING_ALLOW);
     }
 
-    if (mouse_lock_tab_ &&
-        mouse_lock_tab_->GotResponseToLockMouseRequest(true)) {
+    WebContents* tab = GetExclusiveAccessTab();
+    if (tab && tab->GotResponseToLockMouseRequest(true)) {
       mouse_lock_state_ = MOUSELOCK_ACCEPTED;
     } else {
       mouse_lock_state_ = MOUSELOCK_NOT_REQUESTED;
-      SetMouseLockTab(NULL);
+      SetTabWithExclusiveAccess(nullptr);
     }
     NotifyMouseLockChange();
+    return true;
   }
 
-  if (fullscreen && !tab_fullscreen_accepted_) {
-    DCHECK(fullscreened_tab_);
-    if (pattern.IsValid()) {
-      settings_map->SetContentSetting(
-          pattern, ContentSettingsPattern::Wildcard(),
-          CONTENT_SETTINGS_TYPE_FULLSCREEN, std::string(),
-          CONTENT_SETTING_ALLOW);
-    }
-    tab_fullscreen_accepted_ = true;
-  }
-  UpdateFullscreenExitBubbleContent();
+  return false;
 }
 
-void FullscreenController::OnDenyFullscreenPermission() {
-  if (!fullscreened_tab_ && !mouse_lock_tab_)
-    return;
+bool MouseLockController::OnDenyExclusiveAccessPermission() {
+  WebContents* tab = GetExclusiveAccessTab();
 
-  if (IsMouseLockRequested()) {
+  if (tab && IsMouseLockRequested()) {
     mouse_lock_state_ = MOUSELOCK_NOT_REQUESTED;
-    if (mouse_lock_tab_)
-      mouse_lock_tab_->GotResponseToLockMouseRequest(false);
-    SetMouseLockTab(NULL);
+    tab->GotResponseToLockMouseRequest(false);
+    SetTabWithExclusiveAccess(nullptr);
     NotifyMouseLockChange();
-
-    // UpdateFullscreenExitBubbleContent() must be called, but to avoid
-    // duplicate calls we do so only if not adjusting the fullscreen state
-    // below, which also calls UpdateFullscreenExitBubbleContent().
-    if (!IsWindowFullscreenForTabOrPending())
-      UpdateFullscreenExitBubbleContent();
+    return true;
   }
 
-  if (IsWindowFullscreenForTabOrPending())
-    ExitTabFullscreenOrMouseLockIfNecessary();
+  return false;
 }
 
-void FullscreenController::LostMouseLock() {
+void MouseLockController::LostMouseLock() {
   mouse_lock_state_ = MOUSELOCK_NOT_REQUESTED;
-  SetMouseLockTab(NULL);
+  SetTabWithExclusiveAccess(nullptr);
   NotifyMouseLockChange();
-  UpdateFullscreenExitBubbleContent();
-}
-
-void FullscreenController::Observe(int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  DCHECK_EQ(content::NOTIFICATION_NAV_ENTRY_COMMITTED, type);
-  if (content::Details<content::LoadCommittedDetails>(details)->
-      is_navigation_to_different_page())
-    ExitTabFullscreenOrMouseLockIfNecessary();
-}
-
-GURL FullscreenController::GetFullscreenExitBubbleURL() const {
-  if (fullscreened_tab_)
-    return fullscreened_tab_->GetURL();
-  if (mouse_lock_tab_)
-    return mouse_lock_tab_->GetURL();
-  return extension_caused_fullscreen_;
-}
-
-ExclusiveAccessBubbleType FullscreenController::GetExclusiveAccessBubbleType()
-    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_state_ == MOUSELOCK_ACCEPTED_SILENTLY)
-    return EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE;
-
-  if (!fullscreened_tab_) {
-    if (IsMouseLocked())
-      return EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_EXIT_INSTRUCTION;
-    if (IsMouseLockRequested())
-      return EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_BUTTONS;
-    if (!extension_caused_fullscreen_.is_empty())
-      return EXCLUSIVE_ACCESS_BUBBLE_TYPE_EXTENSION_FULLSCREEN_EXIT_INSTRUCTION;
-    if (toggled_into_fullscreen_ && !app_mode)
-      return EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION;
-    return EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE;
-  }
-
-  if (tab_fullscreen_accepted_) {
-    if (IsPrivilegedFullscreenForTab())
-      return EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE;
-    if (IsMouseLocked())
-      return EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_EXIT_INSTRUCTION;
-    if (IsMouseLockRequested())
-      return EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_BUTTONS;
-    return EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_EXIT_INSTRUCTION;
-  }
-
-  if (IsMouseLockRequested())
-    return EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS;
-  return EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_BUTTONS;
+  UpdateExclusiveAccessExitBubbleContent();
 }
 
-void FullscreenController::UpdateNotificationRegistrations() {
-  if (fullscreened_tab_ && mouse_lock_tab_)
-    DCHECK(fullscreened_tab_ == mouse_lock_tab_);
-
-  WebContents* tab = fullscreened_tab_ ? fullscreened_tab_ : mouse_lock_tab_;
-
-  if (tab && registrar_.IsEmpty()) {
-    registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-        content::Source<content::NavigationController>(&tab->GetController()));
-  } else if (!tab && !registrar_.IsEmpty()) {
-    registrar_.RemoveAll();
-  }
-}
-
-void FullscreenController::PostFullscreenChangeNotification(
-    bool is_fullscreen) {
-  base::MessageLoop::current()->PostTask(
-      FROM_HERE,
-      base::Bind(&FullscreenController::NotifyFullscreenChange,
-                 ptr_factory_.GetWeakPtr(),
-                 is_fullscreen));
-}
-
-void FullscreenController::NotifyFullscreenChange(bool is_fullscreen) {
-  content::NotificationService::current()->Notify(
-      chrome::NOTIFICATION_FULLSCREEN_CHANGED,
-      content::Source<FullscreenController>(this),
-      content::Details<bool>(&is_fullscreen));
-}
-
-void FullscreenController::NotifyTabOfExitIfNecessary() {
-  if (fullscreened_tab_) {
-    RenderViewHost* rvh = fullscreened_tab_->GetRenderViewHost();
-    SetFullscreenedTab(NULL);
-    state_prior_to_tab_fullscreen_ = STATE_INVALID;
-    tab_fullscreen_accepted_ = false;
-    if (rvh)
-      rvh->ExitFullscreen();
-  }
-
-  if (mouse_lock_tab_) {
-    if (IsMouseLockRequested()) {
-      mouse_lock_tab_->GotResponseToLockMouseRequest(false);
-      NotifyMouseLockChange();
-    } else {
-      UnlockMouse();
-    }
-    SetMouseLockTab(NULL);
-    mouse_lock_state_ = MOUSELOCK_NOT_REQUESTED;
-  }
-
-  UpdateFullscreenExitBubbleContent();
+bool MouseLockController::IsMouseLockRequested() const {
+  return mouse_lock_state_ == MOUSELOCK_REQUESTED;
 }
 
-void FullscreenController::NotifyMouseLockChange() {
+void MouseLockController::NotifyMouseLockChange() {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
-      content::Source<FullscreenController>(this),
+      content::Source<MouseLockController>(this),
       content::NotificationService::NoDetails());
 }
 
-void FullscreenController::ToggleFullscreenModeInternal(
-    FullscreenInternalOption option) {
-#if defined(OS_WIN)
-  // When in Metro snap mode, toggling in and out of fullscreen is prevented.
-  if (IsInMetroSnapMode())
-    return;
-#endif
-
-  bool enter_fullscreen = !window_->IsFullscreen();
-
-  // When a Mac user requests a toggle they may be toggling between
-  // FullscreenWithoutChrome and FullscreenWithToolbar.
-  if (window_->IsFullscreen() &&
-      !IsWindowFullscreenForTabOrPending() &&
-      window_->SupportsFullscreenWithToolbar()) {
-    if (option == BROWSER_WITH_TOOLBAR) {
-      enter_fullscreen =
-          enter_fullscreen || !window_->IsFullscreenWithToolbar();
-    } else {
-      enter_fullscreen = enter_fullscreen || window_->IsFullscreenWithToolbar();
-    }
-  }
-
-  // In kiosk mode, we always want to be fullscreen. When the browser first
-  // starts we're not yet fullscreen, so let the initial toggle go through.
-  if (chrome::IsRunningInAppMode() && window_->IsFullscreen())
-    return;
+void MouseLockController::UnlockMouse() {
+  WebContents* tab = GetExclusiveAccessTab();
 
-#if !defined(OS_MACOSX)
-  // Do not enter fullscreen mode if disallowed by pref. This prevents the user
-  // from manually entering fullscreen mode and also disables kiosk mode on
-  // desktop platforms.
-  if (enter_fullscreen &&
-      !profile_->GetPrefs()->GetBoolean(prefs::kFullscreenAllowed)) {
+  if (!tab)
     return;
-  }
-#endif
-
-  if (enter_fullscreen)
-    EnterFullscreenModeInternal(option);
-  else
-    ExitFullscreenModeInternal();
-}
-
-void FullscreenController::EnterFullscreenModeInternal(
-    FullscreenInternalOption option) {
-  toggled_into_fullscreen_ = true;
-  GURL url;
-  if (option == TAB) {
-    url = browser_->tab_strip_model()->GetActiveWebContents()->GetURL();
-    tab_fullscreen_accepted_ =
-        GetFullscreenSetting(url) == CONTENT_SETTING_ALLOW;
-  } 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.
-
-  window_->EnterFullscreen(url, GetExclusiveAccessBubbleType(),
-                           option == BROWSER_WITH_TOOLBAR);
-
-  UpdateFullscreenExitBubbleContent();
-
-  // Once the window has become fullscreen it'll call back to
-  // WindowFullscreenStateChanged(). We don't do this immediately as
-  // BrowserWindow::EnterFullscreen() asks for bookmark_bar_state_, so we let
-  // the BrowserWindow invoke WindowFullscreenStateChanged when appropriate.
-}
-
-void FullscreenController::ExitFullscreenModeInternal() {
-  toggled_into_fullscreen_ = false;
-#if defined(OS_MACOSX)
-  // Mac windows report a state change instantly, and so we must also clear
-  // state_prior_to_tab_fullscreen_ to match them else other logic using
-  // state_prior_to_tab_fullscreen_ will be incorrect.
-  NotifyTabOfExitIfNecessary();
-#endif
-  window_->ExitFullscreen();
-  extension_caused_fullscreen_ = GURL();
-
-  UpdateFullscreenExitBubbleContent();
-}
-
-void FullscreenController::SetFullscreenedTab(WebContents* tab) {
-  fullscreened_tab_ = tab;
-  UpdateNotificationRegistrations();
-}
-
-void FullscreenController::SetMouseLockTab(WebContents* tab) {
-  mouse_lock_tab_ = tab;
-  UpdateNotificationRegistrations();
-}
-
-void FullscreenController::ExitTabFullscreenOrMouseLockIfNecessary() {
-  if (IsWindowFullscreenForTabOrPending())
-    ToggleFullscreenModeForTab(fullscreened_tab_, false);
-  else
-    NotifyTabOfExitIfNecessary();
-}
-
-void FullscreenController::UpdateFullscreenExitBubbleContent() {
-  GURL url = GetFullscreenExitBubbleURL();
-  ExclusiveAccessBubbleType bubble_type = GetExclusiveAccessBubbleType();
-
-  // If bubble displays buttons, unlock mouse to allow pressing them.
-  if (exclusive_access_bubble::ShowButtonsForType(bubble_type) &&
-      IsMouseLocked())
-    UnlockMouse();
-
-  window_->UpdateFullscreenExitBubbleContent(url, bubble_type);
-}
-
-ContentSetting
-FullscreenController::GetFullscreenSetting(const GURL& url) const {
-  if (IsPrivilegedFullscreenForTab() || url.SchemeIsFile())
-    return CONTENT_SETTING_ALLOW;
-
-  return profile_->GetHostContentSettingsMap()->GetContentSetting(url, url,
-      CONTENT_SETTINGS_TYPE_FULLSCREEN, std::string());
-}
-
-ContentSetting
-FullscreenController::GetMouseLockSetting(const GURL& url) const {
-  if (IsPrivilegedFullscreenForTab() || url.SchemeIsFile())
-    return CONTENT_SETTING_ALLOW;
-
-  HostContentSettingsMap* settings_map = profile_->GetHostContentSettingsMap();
-  return settings_map->GetContentSetting(url, url,
-      CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string());
-}
-
-bool FullscreenController::IsPrivilegedFullscreenForTab() const {
-  const bool embedded_widget_present =
-      fullscreened_tab_ &&
-      fullscreened_tab_->GetFullscreenRenderWidgetHostView();
-  return embedded_widget_present || is_privileged_fullscreen_for_testing_;
-}
-
-void FullscreenController::SetPrivilegedFullscreenForTesting(
-    bool is_privileged) {
-  is_privileged_fullscreen_for_testing_ = is_privileged;
-}
-
-bool FullscreenController::MaybeToggleFullscreenForCapturedTab(
-    WebContents* web_contents, bool enter_fullscreen) {
-  if (enter_fullscreen) {
-    if (web_contents->GetCapturerCount() > 0) {
-      FullscreenWithinTabHelper::CreateForWebContents(web_contents);
-      FullscreenWithinTabHelper::FromWebContents(web_contents)->
-          SetIsFullscreenForCapturedTab(true);
-      return true;
-    }
-  } else {
-    if (IsFullscreenForCapturedTab(web_contents)) {
-      FullscreenWithinTabHelper::RemoveForWebContents(web_contents);
-      return true;
-    }
-  }
-
-  return false;
-}
-
-bool FullscreenController::IsFullscreenForCapturedTab(
-    const WebContents* web_contents) const {
-  // Note: On Mac, some of the OnTabXXX() methods get called with a NULL value
-  // for web_contents. Check for that here.
-  const FullscreenWithinTabHelper* const helper = web_contents ?
-      FullscreenWithinTabHelper::FromWebContents(web_contents) : NULL;
-  if (helper && helper->is_fullscreen_for_captured_tab()) {
-    DCHECK_NE(fullscreened_tab_, web_contents);
-    return true;
+  content::RenderWidgetHostView* mouse_lock_view = nullptr;
+  FullscreenController* fullscreen_controller =
+      GetManager()->GetFullscreenController();
+  if ((fullscreen_controller->GetExclusiveAccessTab() == tab) &&
+      fullscreen_controller->IsPrivilegedFullscreenForTab()) {
+    mouse_lock_view =
+        GetExclusiveAccessTab()->GetFullscreenRenderWidgetHostView();
   }
-  return false;
-}
 
-void FullscreenController::UnlockMouse() {
-  if (!mouse_lock_tab_)
-    return;
-  content::RenderWidgetHostView* mouse_lock_view =
-      (fullscreened_tab_ == mouse_lock_tab_ && IsPrivilegedFullscreenForTab()) ?
-      mouse_lock_tab_->GetFullscreenRenderWidgetHostView() : NULL;
   if (!mouse_lock_view) {
-    RenderViewHost* const rvh = mouse_lock_tab_->GetRenderViewHost();
+    RenderViewHost* const rvh = GetExclusiveAccessTab()->GetRenderViewHost();
     if (rvh)
       mouse_lock_view = rvh->GetView();
   }
+
   if (mouse_lock_view)
     mouse_lock_view->UnlockMouse();
 }
+
+ContentSetting MouseLockController::GetMouseLockSetting(const GURL& url) const {
+  if (GetManager()->GetFullscreenController()->IsPrivilegedFullscreenForTab() ||
+      url.SchemeIsFile())
+    return CONTENT_SETTING_ALLOW;
+
+  HostContentSettingsMap* settings_map =
+      GetProfile()->GetHostContentSettingsMap();
+  return settings_map->GetContentSetting(
+      url, url, CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string());
+}