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

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_controller_private.mm

Issue 7890056: FullscreenExitBubble temp UI for Mac. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 3 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h" 5 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #import "base/memory/scoped_nsobject.h" 10 #import "base/memory/scoped_nsobject.h"
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 // If we're not displaying the bookmark bar below the infobar, then it goes 256 // If we're not displaying the bookmark bar below the infobar, then it goes
257 // immediately below the toolbar. 257 // immediately below the toolbar.
258 BOOL placeBookmarkBarBelowInfoBar = [self placeBookmarkBarBelowInfoBar]; 258 BOOL placeBookmarkBarBelowInfoBar = [self placeBookmarkBarBelowInfoBar];
259 if (!placeBookmarkBarBelowInfoBar) 259 if (!placeBookmarkBarBelowInfoBar)
260 maxY = [self layoutBookmarkBarAtMinX:minX maxY:maxY width:width]; 260 maxY = [self layoutBookmarkBarAtMinX:minX maxY:maxY width:width];
261 261
262 // The floating bar backing view doesn't actually add any height. 262 // The floating bar backing view doesn't actually add any height.
263 NSRect floatingBarBackingRect = 263 NSRect floatingBarBackingRect =
264 NSMakeRect(minX, maxY, width, floatingBarHeight); 264 NSMakeRect(minX, maxY, width, floatingBarHeight);
265 [self layoutFloatingBarBackingView:floatingBarBackingRect 265 [self layoutFloatingBarBackingView:floatingBarBackingRect
266 presentationMode:inPresentationMode]; 266 presentationMode:showFloatingChrome_];
267 267
268 // Place the find bar immediately below the toolbar/attached bookmark bar. In 268 // Place the find bar immediately below the toolbar/attached bookmark bar. In
269 // presentation mode, it hangs off the top of the screen when the bar is 269 // presentation mode, it hangs off the top of the screen when the bar is
270 // hidden. The find bar is unaffected by the side tab positioning. 270 // hidden. The find bar is unaffected by the side tab positioning.
271 [findBarCocoaController_ positionFindBarViewAtMaxY:maxY maxWidth:width]; 271 [findBarCocoaController_ positionFindBarViewAtMaxY:maxY maxWidth:width];
272 272
273 // If in presentation mode, reset |maxY| to top of screen, so that the 273 // If in presentation mode, reset |maxY| to top of screen, so that the
274 // floating bar slides over the things which appear to be in the content area. 274 // floating bar slides over the things which appear to be in the content area.
275 if (inPresentationMode) 275 if (inPresentationMode)
276 maxY = NSMaxY(contentBounds); 276 maxY = NSMaxY(contentBounds);
(...skipping 594 matching lines...) Expand 10 before | Expand all | Expand 10 after
871 - (void)disableBarVisibilityUpdates { 871 - (void)disableBarVisibilityUpdates {
872 // Early escape if there's nothing to do. 872 // Early escape if there's nothing to do.
873 if (!barVisibilityUpdatesEnabled_) 873 if (!barVisibilityUpdatesEnabled_)
874 return; 874 return;
875 875
876 barVisibilityUpdatesEnabled_ = NO; 876 barVisibilityUpdatesEnabled_ = NO;
877 [presentationModeController_ cancelAnimationAndTimers]; 877 [presentationModeController_ cancelAnimationAndTimers];
878 } 878 }
879 879
880 @end // @implementation BrowserWindowController(Private) 880 @end // @implementation BrowserWindowController(Private)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698