Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(886)

Unified Diff: chrome/browser/ui/cocoa/browser_window_controller.mm

Issue 789403002: Rename fullscreen_exit_bubble_* to exclusive_access_bubble_* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix mac build breaks Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/browser_window_controller.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
index eea5f0f77efa945f6d57f507b909dac6da4cd12c..5c71b11343ac0abe04233172257454311058ff2e 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -2021,8 +2021,9 @@ willAnimateFromState:(BookmarkBar::State)oldState
}
// (Private/TestingAPI)
-- (FullscreenExitBubbleController*)fullscreenExitBubbleController {
- return fullscreenExitBubbleController_.get();
+- (ExclusiveAccessBubbleWindowController*)
+ exclusiveAccessBubbleWindowController {
+ return exclusiveAccessBubbleWindowController_.get();
}
- (NSRect)omniboxPopupAnchorRect {
@@ -2091,9 +2092,9 @@ willAnimateFromState:(BookmarkBar::State)oldState
}
- (void)updateFullscreenExitBubbleURL:(const GURL&)url
- bubbleType:(FullscreenExitBubbleType)bubbleType {
+ bubbleType:(ExclusiveAccessBubbleType)bubbleType {
fullscreenUrl_ = url;
- fullscreenBubbleType_ = bubbleType;
+ exclusiveAccessBubbleType_ = bubbleType;
[self layoutSubviews];
[self showFullscreenExitBubbleIfNecessary];
}
@@ -2113,10 +2114,10 @@ willAnimateFromState:(BookmarkBar::State)oldState
}
- (void)enterExtensionFullscreenForURL:(const GURL&)url
- bubbleType:(FullscreenExitBubbleType)bubbleType {
+ bubbleType:(ExclusiveAccessBubbleType)bubbleType {
if (chrome::mac::SupportsSystemFullscreen()) {
fullscreenUrl_ = url;
- fullscreenBubbleType_ = bubbleType;
+ exclusiveAccessBubbleType_ = bubbleType;
[self enterBrowserFullscreenWithToolbar:NO];
} else {
[self enterImmersiveFullscreen];
@@ -2126,7 +2127,7 @@ willAnimateFromState:(BookmarkBar::State)oldState
}
- (void)enterWebContentFullscreenForURL:(const GURL&)url
- bubbleType:(FullscreenExitBubbleType)bubbleType {
+ bubbleType:(ExclusiveAccessBubbleType)bubbleType {
[self enterImmersiveFullscreen];
if (!url.is_empty())
[self updateFullscreenExitBubbleURL:url bubbleType:bubbleType];

Powered by Google App Engine
This is Rietveld 408576698