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

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

Issue 523723002: mac, fullscreen: Several bug fixes after major refactor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@new_fullscreen2
Patch Set: Created 6 years, 4 months 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 8eca95c4ebd3d8170145d4c4425d52faea069ad1..a6ebb0842b4ff787ca1e4a5c16df365d8ca001df 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -2036,7 +2036,6 @@ willAnimateFromState:(BookmarkBar::State)oldState
@end // @implementation BrowserWindowController
-
@implementation BrowserWindowController(Fullscreen)
- (void)handleLionToggleFullscreen {
@@ -2080,7 +2079,6 @@ willAnimateFromState:(BookmarkBar::State)oldState
- (BOOL)isInFullscreenWithOmniboxSliding {
return presentationModeController_.get() != nil;
- //[presentationModeController_ inPresentationMode]);
}
- (void)enterPresentationModeForURL:(const GURL&)url
@@ -2124,7 +2122,8 @@ willAnimateFromState:(BookmarkBar::State)oldState
- (BOOL)inPresentationMode {
return presentationModeController_.get() &&
[presentationModeController_ inPresentationMode] &&
- fullscreenStyle_ == fullscreen_mac::OMNIBOX_TABS_HIDDEN;
+ presentationModeController_.get().slidingStyle ==
+ fullscreen_mac::OMNIBOX_TABS_HIDDEN;
}
- (void)resizeFullscreenWindow {
@@ -2137,15 +2136,6 @@ willAnimateFromState:(BookmarkBar::State)oldState
[self layoutSubviews];
}
-- (CGFloat)floatingBarShownFraction {
- return floatingBarShownFraction_;
-}
-
-- (void)setFloatingBarShownFraction:(CGFloat)fraction {
- floatingBarShownFraction_ = fraction;
- [self layoutSubviews];
-}
-
- (BOOL)isBarVisibilityLockedForOwner:(id)owner {
DCHECK(owner);
DCHECK(barVisibilityLocks_);

Powered by Google App Engine
This is Rietveld 408576698