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

Side by Side Diff: chrome/browser/cocoa/browser_window_controller.h

Issue 747001: Mac: fix fullscreen floating bar in popup windows. (Closed)
Patch Set: changes per review Created 10 years, 9 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #ifndef CHROME_BROWSER_COCOA_BROWSER_WINDOW_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_COCOA_BROWSER_WINDOW_CONTROLLER_H_
6 #define CHROME_BROWSER_COCOA_BROWSER_WINDOW_CONTROLLER_H_ 6 #define CHROME_BROWSER_COCOA_BROWSER_WINDOW_CONTROLLER_H_
7 7
8 // A class acting as the Objective-C controller for the Browser 8 // A class acting as the Objective-C controller for the Browser
9 // object. Handles interactions between Cocoa and the cross-platform 9 // object. Handles interactions between Cocoa and the cross-platform
10 // code. Each window has a single toolbar and, by virtue of being a 10 // code. Each window has a single toolbar and, by virtue of being a
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 // The raw accumulated zoom value and the actual zoom increments made for an 93 // The raw accumulated zoom value and the actual zoom increments made for an
94 // an in-progress pinch gesture. 94 // an in-progress pinch gesture.
95 CGFloat totalMagnifyGestureAmount_; 95 CGFloat totalMagnifyGestureAmount_;
96 NSInteger currentZoomStepDelta_; 96 NSInteger currentZoomStepDelta_;
97 97
98 // The view which shows the incognito badge (NULL if not an incognito window). 98 // The view which shows the incognito badge (NULL if not an incognito window).
99 // Needed to access the view to move it to/from the fullscreen window. 99 // Needed to access the view to move it to/from the fullscreen window.
100 scoped_nsobject<IncognitoImageView> incognitoBadge_; 100 scoped_nsobject<IncognitoImageView> incognitoBadge_;
101 101
102 // Lazily created view which draws the background for the floating set of bars 102 // Lazily created view which draws the background for the floating set of bars
103 // in fullscreen mode. 103 // in fullscreen mode (for window types having a floating bar; it remains nil
104 // for those which don't).
104 scoped_nsobject<NSView> floatingBarBackingView_; 105 scoped_nsobject<NSView> floatingBarBackingView_;
105 106
106 // Tracks whether the floating bar is above or below the bookmark bar, in 107 // Tracks whether the floating bar is above or below the bookmark bar, in
107 // terms of z-order. 108 // terms of z-order.
108 BOOL floatingBarAboveBookmarkBar_; 109 BOOL floatingBarAboveBookmarkBar_;
109 110
110 // The proportion of the floating bar which is shown (in fullscreen mode). 111 // The proportion of the floating bar which is shown (in fullscreen mode).
111 CGFloat floatingBarShownFraction_; 112 CGFloat floatingBarShownFraction_;
112 113
113 // Various UI elements/events may want to ensure that the floating bar is 114 // Various UI elements/events may want to ensure that the floating bar is
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 - (NSPoint)topLeftForBubble; 351 - (NSPoint)topLeftForBubble;
351 352
352 // Resets any saved state about window growth (due to showing the bookmark bar 353 // Resets any saved state about window growth (due to showing the bookmark bar
353 // or the download shelf), so that future shrinking will occur from the bottom. 354 // or the download shelf), so that future shrinking will occur from the bottom.
354 - (void)resetWindowGrowthState; 355 - (void)resetWindowGrowthState;
355 356
356 @end // @interface BrowserWindowController(TestingAPI) 357 @end // @interface BrowserWindowController(TestingAPI)
357 358
358 359
359 #endif // CHROME_BROWSER_COCOA_BROWSER_WINDOW_CONTROLLER_H_ 360 #endif // CHROME_BROWSER_COCOA_BROWSER_WINDOW_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/cocoa/browser_frame_view.mm ('k') | chrome/browser/cocoa/browser_window_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698