Refactor: Untangle Mac's ExclusiveAccessContext from BrowserWindow

chrome/browser/ui/cocoa/browser_window_controller.mm

 // Copyright 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.
 
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 
 #include <cmath>
 #include <numeric>
 #include <utility>
 
@@ skipping 24 matching lines @@
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window_state.h"
 #import "chrome/browser/ui/cocoa/background_gradient_view.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_observer_cocoa.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h"
+#import "chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.h"
 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 #import "chrome/browser/ui/cocoa/browser_window_command_handler.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h"
 #import "chrome/browser/ui/cocoa/browser_window_layout.h"
 #import "chrome/browser/ui/cocoa/browser_window_utils.h"
 #import "chrome/browser/ui/cocoa/dev_tools_controller.h"
 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h"
 #include "chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.h"
 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
@@ skipping 238 matching lines @@
     // When we are given x/y coordinates of 0 on a created popup window, assume
     // none were given by the window.open() command.
     if (browser_->is_type_popup() &&
         windowRect.x() == 0 && windowRect.y() == 0) {
       gfx::Size size = windowRect.size();
       windowRect.set_origin(
           WindowSizer::GetDefaultPopupOrigin(size,
                                              browser_->host_desktop_type()));
     }
 
+    // Creates the manager for fullscreen and fullscreen bubbles.
+    exclusiveAccessController_.reset(
+        new ExclusiveAccessController(self, browser_.get()));
+
     // Size and position the window.  Note that it is not yet onscreen.  Popup
     // windows may get resized later on in this function, once the actual size
     // of the toolbar/tabstrip is known.
     windowShim_->SetBounds(windowRect);
 
     // Puts the incognito badge on the window frame, if necessary.
     [self installAvatar];
 
     // Create a sub-controller for the docked devTools and add its view to the
     // hierarchy.
@@ skipping 1564 matching lines @@
   CGFloat y = 0;
   if (NSMaxY(target) < NSMaxY(source))
     y = NSMaxY(source) - NSMaxY(target);
   else if (NSMinY(source) < NSMinY(target))
     y = NSMinY(source) - NSMinY(target);
 
   return NSMakeSize(x, y);
 }
 
 // (Private/TestingAPI)
-- (ExclusiveAccessBubbleWindowController*)
-        exclusiveAccessBubbleWindowController {
-  return exclusiveAccessBubbleWindowController_.get();
-}
-
 - (NSRect)omniboxPopupAnchorRect {
   // Start with toolbar rect.
   NSView* toolbarView = [toolbarController_ view];
   NSRect anchorRect = [toolbarView frame];
 
   // Adjust to account for height and possible bookmark bar. Compress by 1
   // to account for the separator.
   anchorRect.origin.y =
       NSMaxY(anchorRect) - [toolbarController_ desiredHeightForCompression:1];
 
@@ skipping 50 matching lines @@
     [self enterAppKitFullscreen];
   }
 }
 
 - (void)updateFullscreenWithToolbar:(BOOL)withToolbar {
   [self adjustUIForSlidingFullscreenStyle:
             withToolbar ? fullscreen_mac::OMNIBOX_TABS_PRESENT
                         : fullscreen_mac::OMNIBOX_TABS_HIDDEN];
 }
 
-- (void)updateFullscreenExitBubbleURL:(const GURL&)url
-                           bubbleType:(ExclusiveAccessBubbleType)bubbleType {
-  fullscreenUrl_ = url;
-  exclusiveAccessBubbleType_ = bubbleType;
+- (void)updateFullscreenExitBubble {
   [self layoutSubviews];
   [self showFullscreenExitBubbleIfNecessary];
 }
 
 - (void)toggleFullscreenToolbar {
   shouldHideFullscreenToolbar_ = !shouldHideFullscreenToolbar_;
 
   if ([self isInAppKitFullscreen])
     [self updateFullscreenWithToolbar:!shouldHideFullscreenToolbar_];
 }
 
 - (BOOL)isInAnyFullscreenMode {
   return [self isInImmersiveFullscreen] || [self isInAppKitFullscreen];
 }
 
 - (BOOL)isInImmersiveFullscreen {
   return fullscreenWindow_.get() != nil || enteringImmersiveFullscreen_;
 }
 
 - (BOOL)isInAppKitFullscreen {
   return !exitingAppKitFullscreen_ &&
          (([[self window] styleMask] & NSFullScreenWindowMask) ==
               NSFullScreenWindowMask ||
           enteringAppKitFullscreen_);
 }
 
-- (void)enterExtensionFullscreenForURL:(const GURL&)url
-                            bubbleType:(ExclusiveAccessBubbleType)bubbleType {
+- (void)enterExtensionFullscreen {
   if (chrome::mac::SupportsSystemFullscreen()) {
-    fullscreenUrl_ = url;
-    exclusiveAccessBubbleType_ = bubbleType;
     [self enterBrowserFullscreenWithToolbar:NO];
   } else {
     [self enterImmersiveFullscreen];
-    DCHECK(!url.is_empty());
-    [self updateFullscreenExitBubbleURL:url bubbleType:bubbleType];
+    DCHECK(!exclusiveAccessController_->url().is_empty());
+    [self updateFullscreenExitBubble];
   }
 }
 
-- (void)enterWebContentFullscreenForURL:(const GURL&)url
-                             bubbleType:(ExclusiveAccessBubbleType)bubbleType {
+- (void)enterWebContentFullscreen {
   // HTML5 Fullscreen should only use AppKit fullscreen in 10.10+.
   if (chrome::mac::SupportsSystemFullscreen() &&
       base::mac::IsOSYosemiteOrLater())
     [self enterAppKitFullscreen];
   else
     [self enterImmersiveFullscreen];
 
-  if (!url.is_empty())
-    [self updateFullscreenExitBubbleURL:url bubbleType:bubbleType];
+  if (!exclusiveAccessController_->url().is_empty())
+    [self updateFullscreenExitBubble];
 }
 
 - (void)exitAnyFullscreen {
   // TODO(erikchen): Fullscreen modes should stack. Should be able to exit
   // Immersive Fullscreen and still be in AppKit Fullscreen.
   if ([self isInAppKitFullscreen])
     [self exitAppKitFullscreen];
   if ([self isInImmersiveFullscreen])
     [self exitImmersiveFullscreen];
 }
@@ skipping 52 matching lines @@
                                                               delay:delay];
     }
   }
 }
 
 - (BOOL)floatingBarHasFocus {
   NSResponder* focused = [[self window] firstResponder];
   return [focused isKindOfClass:[AutocompleteTextFieldEditor class]];
 }
 
+- (ExclusiveAccessController*)exclusiveAccessController {
+  return exclusiveAccessController_.get();
+}
+
 @end  // @implementation BrowserWindowController(Fullscreen)
 
 
 @implementation BrowserWindowController(WindowType)
 
 - (BOOL)supportsWindowFeature:(int)feature {
   return browser_->SupportsWindowFeature(
       static_cast<Browser::WindowFeature>(feature));
 }
 
@@ skipping 11 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isTabbedWindow {
   return browser_->is_type_tabbed();
 }
 
 @end  // @implementation BrowserWindowController(WindowType)