Index: chrome/browser/ui/cocoa/browser_window_controller.h |
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.h b/chrome/browser/ui/cocoa/browser_window_controller.h |
index 551599abc709adf288d255a38e508501137180af..d4973fb79aca50981dfd21d3fbcd11501898c89d 100644 |
--- a/chrome/browser/ui/cocoa/browser_window_controller.h |
+++ b/chrome/browser/ui/cocoa/browser_window_controller.h |
@@ -15,15 +15,14 @@ |
#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" |
@@ -37,6 +36,8 @@ class BrowserWindowCocoa; |
@class DevToolsController; |
@class DownloadShelfController; |
class ExtensionKeybindingRegistryCocoa; |
+class ExclusiveAccessController; |
+class ExclusiveAccessContext; |
@class FindBarCocoaController; |
@class FullscreenModeController; |
@class FullscreenWindow; |
@@ -81,8 +82,7 @@ class Command; |
base::scoped_nsobject<OverlayableContentsController> |
overlayableContentsController_; |
base::scoped_nsobject<PresentationModeController> presentationModeController_; |
- base::scoped_nsobject<ExclusiveAccessBubbleWindowController> |
- exclusiveAccessBubbleWindowController_; |
+ scoped_ptr<ExclusiveAccessController> exclusiveAccessController_; |
base::scoped_nsobject<BrowserWindowFullscreenTransition> |
fullscreenTransition_; |
@@ -186,12 +186,6 @@ class Command; |
// 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_; |
@@ -532,8 +526,7 @@ class Command; |
// 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 |
@@ -552,12 +545,10 @@ class Command; |
- (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; |
@@ -595,6 +586,9 @@ class Command; |
// Returns YES if any of the views in the floating bar currently has focus. |
- (BOOL)floatingBarHasFocus; |
+// Accessor for the controller managing fullscreen ExclusiveAccessContext. |
+- (ExclusiveAccessContext*)exclusiveAccessContext; |
+ |
@end // @interface BrowserWindowController(Fullscreen) |
@@ -631,9 +625,6 @@ class Command; |
- (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; |