Refactor: Untangle Mac's ExclusiveAccessContext from BrowserWindow

chrome/browser/ui/cocoa/browser_window_controller_private.mm

 // Copyright (c) 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_private.h"
 
 #include <cmath>
 
 #import "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/mac/bind_objc_block.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
 #import "base/mac/scoped_nsobject.h"
 #import "base/mac/sdk_forward_declarations.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/fullscreen.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window_state.h"
 #import "chrome/browser/ui/cocoa/browser_window_fullscreen_transition.h"
 #import "chrome/browser/ui/cocoa/browser_window_layout.h"
+#import "chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.h"
 #import "chrome/browser/ui/cocoa/custom_frame_view.h"
 #import "chrome/browser/ui/cocoa/dev_tools_controller.h"
 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"
 #import "chrome/browser/ui/cocoa/floating_bar_backing_view.h"
 #import "chrome/browser/ui/cocoa/framed_browser_window.h"
 #import "chrome/browser/ui/cocoa/fullscreen_window.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h"
@@ skipping 585 matching lines @@
   // |-updateFullscreenExitBubbleURL:bubbleType:|. If we're in the middle of the
   // transition into fullscreen (i.e., using the AppKit Fullscreen API), do not
   // show the bubble because it will cause visual jank
   // (http://crbug.com/130649). This will be called again as part of
   // |-windowDidEnterFullScreen:|, so arrange to do that work then instead.
   if (enteringAppKitFullscreen_)
     return;
 
   [self hideOverlayIfPossibleWithAnimation:NO delay:NO];
 
-  if (exclusiveAccessBubbleType_ == EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE ||
-      exclusiveAccessBubbleType_ ==
-          EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION) {
-    // Show no exit instruction bubble on Mac when in Browser Fullscreen.
-    [self destroyFullscreenExitBubbleIfNecessary];
-  } else {
-    [exclusiveAccessBubbleWindowController_ closeImmediately];
-    exclusiveAccessBubbleWindowController_.reset(
-        [[ExclusiveAccessBubbleWindowController alloc]
-                       initWithOwner:self
-            exclusive_access_manager:browser_.get()->exclusive_access_manager()
-                             profile:browser_.get()->profile()
-                                 url:fullscreenUrl_
-                          bubbleType:exclusiveAccessBubbleType_]);
-    [exclusiveAccessBubbleWindowController_ showWindow];
+  switch (exclusiveAccessController_->bubble_type()) {
+    case EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE:
+    case EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION:
+      // Show no exit instruction bubble on Mac when in Browser Fullscreen.
+      exclusiveAccessController_->Destroy();
+      break;
+
+    default:
+      exclusiveAccessController_->Show();
   }
 }
 
-- (void)destroyFullscreenExitBubbleIfNecessary {
-  [exclusiveAccessBubbleWindowController_ closeImmediately];
-  exclusiveAccessBubbleWindowController_.reset();
-}
-
 - (void)contentViewDidResize:(NSNotification*)notification {
   [self layoutSubviews];
 }
 
 - (void)registerForContentViewResizeNotifications {
   [[NSNotificationCenter defaultCenter]
       addObserver:self
          selector:@selector(contentViewDidResize:)
              name:NSViewFrameDidChangeNotification
            object:[[self window] contentView]];
@@ skipping 183 matching lines @@
   ConstrainedWindowSheetController* sheetController =
       [ConstrainedWindowSheetController
           controllerForParentWindow:[self window]];
   if (shoudHide)
     [sheetController hideSheetForFullscreenTransition];
   else
     [sheetController unhideSheetForFullscreenTransition];
 }
 
 - (void)adjustUIForExitingFullscreen {
-  [self destroyFullscreenExitBubbleIfNecessary];
+  exclusiveAccessController_->Destroy();
   [self adjustUIForExitingFullscreenAndStopOmniboxSliding];
 }
 
 - (void)adjustUIForEnteringFullscreen {
   fullscreen_mac::SlidingStyle style;
   if ([self isFullscreenForTabContent]) {
     style = fullscreen_mac::OMNIBOX_TABS_NONE;
   } else if (enteringPresentationMode_ || [self shouldHideFullscreenToolbar]) {
     style = fullscreen_mac::OMNIBOX_TABS_HIDDEN;
   } else {
@@ skipping 174 matching lines @@
   if (!NSIsEmptyRect(output.fullscreenBackingBarFrame)) {
     [floatingBarBackingView_ setFrame:output.fullscreenBackingBarFrame];
     [presentationModeController_
         overlayFrameChanged:output.fullscreenBackingBarFrame];
   }
 
   [findBarCocoaController_
       positionFindBarViewAtMaxY:output.findBarMaxY
                        maxWidth:NSWidth(output.contentAreaFrame)];
 
-  [exclusiveAccessBubbleWindowController_
-      positionInWindowAtTop:output.fullscreenExitButtonMaxY
-                      width:NSWidth(output.contentAreaFrame)];
+  exclusiveAccessController_->Layout(output.fullscreenExitButtonMaxY);
 }
 
 - (void)updateSubviewZOrder {
   if ([self isInAnyFullscreenMode])
     [self updateSubviewZOrderFullscreen];
   else
     [self updateSubviewZOrderNormal];
 }
 
 - (void)updateSubviewZOrderNormal {
@@ skipping 200 matching lines @@
   return nil;
 }
 
 - (BOOL)isFullscreenForTabContent {
   return browser_->exclusive_access_manager()
                  ->fullscreen_controller()
                  ->IsWindowFullscreenForTabOrPending();
 }
 
 @end  // @implementation BrowserWindowController(Private)