Refactor: Untangle Mac's ExclusiveAccessContext from BrowserWindow

chrome/browser/ui/cocoa/browser_window_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_
 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_
 
 // A class acting as the Objective-C controller for the Browser
 // object. Handles interactions between Cocoa and the cross-platform
 // code. Each window has a single toolbar and, by virtue of being a
 // TabWindowController, a tab strip along the top.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/translate/chrome_translate_client.h"
-#include "chrome/browser/ui/tabs/tab_utils.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h"
-#import "chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_window_controller.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #import "chrome/browser/ui/cocoa/url_drop_target.h"
 #import "chrome/browser/ui/cocoa/view_resizer.h"
+#include "chrome/browser/ui/tabs/tab_utils.h"
 #include "components/translate/core/common/translate_errors.h"
 #include "ui/base/accelerators/accelerator_manager.h"
 #include "ui/gfx/geometry/rect.h"
 
 @class AvatarBaseController;
 class BookmarkBubbleObserverCocoa;
 class Browser;
 class BrowserWindow;
 class BrowserWindowCocoa;
 @class BrowserWindowFullscreenTransition;
 @class DevToolsController;
 @class DownloadShelfController;
 class ExtensionKeybindingRegistryCocoa;
+class ExclusiveAccessController;
+class ExclusiveAccessContext;
 @class FindBarCocoaController;
 @class FullscreenModeController;
 @class FullscreenWindow;
 @class InfoBarContainerController;
 class LocationBarViewMac;
 @class OverlayableContentsController;
 class PermissionBubbleCocoa;
 @class PresentationModeController;
 class StatusBubbleMac;
 @class TabStripController;
@@ skipping 24 matching lines @@
   base::scoped_nsobject<ToolbarController> toolbarController_;
   base::scoped_nsobject<TabStripController> tabStripController_;
   base::scoped_nsobject<FindBarCocoaController> findBarCocoaController_;
   base::scoped_nsobject<InfoBarContainerController> infoBarContainerController_;
   base::scoped_nsobject<DownloadShelfController> downloadShelfController_;
   base::scoped_nsobject<BookmarkBarController> bookmarkBarController_;
   base::scoped_nsobject<DevToolsController> devToolsController_;
   base::scoped_nsobject<OverlayableContentsController>
       overlayableContentsController_;
   base::scoped_nsobject<PresentationModeController> presentationModeController_;
-  base::scoped_nsobject<ExclusiveAccessBubbleWindowController>
-      exclusiveAccessBubbleWindowController_;
+  scoped_ptr<ExclusiveAccessController> exclusiveAccessController_;
   base::scoped_nsobject<BrowserWindowFullscreenTransition>
       fullscreenTransition_;
 
   // Strong. StatusBubble is a special case of a strong reference that
   // we don't wrap in a scoped_ptr because it is acting the same
   // as an NSWindowController in that it wraps a window that must
   // be shut down before our destructors are called.
   StatusBubbleMac* statusBubble_;
 
   scoped_ptr<BookmarkBubbleObserverCocoa> bookmarkBubbleObserver_;
@@ skipping 83 matching lines @@
 
   // Bar visibility locks and releases only result (when appropriate) in changes
   // in visible state when the following is |YES|.
   BOOL barVisibilityUpdatesEnabled_;
 
   // If this ivar is set to YES, layoutSubviews calls will be ignored. This is
   // used in fullscreen transition to prevent spurious resize messages from
   // being sent to the renderer, which causes the transition to be janky.
   BOOL blockLayoutSubviews_;
 
-  // When going fullscreen for a tab, we need to store the URL and the
-  // fullscreen type, since we can't show the bubble until
-  // -windowDidEnterFullScreen: gets called.
-  GURL fullscreenUrl_;
-  ExclusiveAccessBubbleType exclusiveAccessBubbleType_;
-
   // The Extension Command Registry used to determine which keyboard events to
   // handle.
   scoped_ptr<ExtensionKeybindingRegistryCocoa> extension_keybinding_registry_;
 }
 
 // A convenience class method which gets the |BrowserWindowController| for a
 // given window. This method returns nil if no window in the chain has a BWC.
 + (BrowserWindowController*)browserWindowControllerForWindow:(NSWindow*)window;
 
 // A convenience class method which gets the |BrowserWindowController| for a
@@ skipping 320 matching lines @@
 // If |withToolbar| is NO, the tab strip and toolbar are hidden
 // (aka Presentation Mode).
 - (void)enterBrowserFullscreenWithToolbar:(BOOL)withToolbar;
 
 // Adds or removes the tab strip and toolbar from the current window. The
 // window must be in immersive or AppKit Fullscreen.
 - (void)updateFullscreenWithToolbar:(BOOL)withToolbar;
 
 // Updates the contents of the fullscreen exit bubble with |url| and
 // |bubbleType|.
-- (void)updateFullscreenExitBubbleURL:(const GURL&)url
-                           bubbleType:(ExclusiveAccessBubbleType)bubbleType;
+- (void)updateFullscreenExitBubble;
 
 // Toggles and updates the toolbar's visibility in fullscreen mode. This
 // function toggles between the sliding styles: OMNIBOX_TABS_PRESENT and
 // OMNIBOX_TABS_HIDDEN.
 - (void)toggleFullscreenToolbar;
 
 // Returns YES if the browser window is in or entering any fullscreen mode.
 - (BOOL)isInAnyFullscreenMode;
 
 // Returns YES if the browser window is currently in or entering fullscreen via
 // the built-in immersive mechanism.
 - (BOOL)isInImmersiveFullscreen;
 
 // Returns YES if the browser window is currently in or entering fullscreen via
 // the AppKit Fullscreen API.
 - (BOOL)isInAppKitFullscreen;
 
 // Enter fullscreen for an extension.
-- (void)enterExtensionFullscreenForURL:(const GURL&)url
-                            bubbleType:(ExclusiveAccessBubbleType)bubbleType;
+- (void)enterExtensionFullscreen;
 
 // Enters Immersive Fullscreen for the given URL.
-- (void)enterWebContentFullscreenForURL:(const GURL&)url
-                             bubbleType:(ExclusiveAccessBubbleType)bubbleType;
+- (void)enterWebContentFullscreen;
 
 // Exits the current fullscreen mode.
 - (void)exitAnyFullscreen;
 
 // Whether the system is in the very specific fullscreen mode: Presentation
 // Mode.
 - (BOOL)inPresentationMode;
 
 // Whether if the toolbar should be hidden in fullscreen.
 - (BOOL)shouldHideFullscreenToolbar;
@@ skipping 17 matching lines @@
 - (void)lockBarVisibilityForOwner:(id)owner
                     withAnimation:(BOOL)animate
                             delay:(BOOL)delay;
 - (void)releaseBarVisibilityForOwner:(id)owner
                        withAnimation:(BOOL)animate
                                delay:(BOOL)delay;
 
 // Returns YES if any of the views in the floating bar currently has focus.
 - (BOOL)floatingBarHasFocus;
 
+// Accessor for the controller managing fullscreen ExclusiveAccessContext.
+- (ExclusiveAccessController*)exclusiveAccessController;
+
 @end  // @interface BrowserWindowController(Fullscreen)
 
 
 // Methods which are either only for testing, or only public for testing.
 @interface BrowserWindowController (TestingAPI)
 
 // Put the incognito badge or multi-profile avatar on the browser and adjust the
 // tab strip accordingly.
 - (void)installAvatar;
 
@@ skipping 16 matching lines @@
 
 // Resets any saved state about window growth (due to showing the bookmark bar
 // or the download shelf), so that future shrinking will occur from the bottom.
 - (void)resetWindowGrowthState;
 
 // Computes by how far in each direction, horizontal and vertical, the
 // |source| rect doesn't fit into |target|.
 - (NSSize)overflowFrom:(NSRect)source
                     to:(NSRect)target;
 
-// The fullscreen exit bubble controller, or nil if the bubble isn't showing.
-- (ExclusiveAccessBubbleWindowController*)exclusiveAccessBubbleWindowController;
-
 // Gets the rect, in window base coordinates, that the omnibox popup should be
 // positioned relative to.
 - (NSRect)omniboxPopupAnchorRect;
 
 @end  // @interface BrowserWindowController (TestingAPI)
 
 
 #endif  // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_