Refactor away the Browser* dependency in exclusive_access

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/exclusive_access_context.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(
+    ExclusiveAccessContext* exclusive_access_context)
+    : exclusive_access_context_(exclusive_access_context),
+      fullscreen_controller_(this),
+      mouse_lock_controller_(this) {
 }
 
 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;
@@ skipping 35 matching lines @@
 
 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);
+  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;
 }
 
 void ExclusiveAccessManager::OnTabDeactivated(WebContents* web_contents) {
@@ skipping 25 matching lines @@
   if (updateBubble)
     UpdateExclusiveAccessExitBubbleContent();
 }
 
 void ExclusiveAccessManager::OnDenyExclusiveAccessPermission() {
   bool updateBubble = mouse_lock_controller_.OnDenyExclusiveAccessPermission();
   updateBubble |= fullscreen_controller_.OnDenyExclusiveAccessPermission();
   if (updateBubble)
     UpdateExclusiveAccessExitBubbleContent();
 }