| Index: chrome/browser/ui/cocoa/browser_window_layout.h
|
| diff --git a/chrome/browser/ui/cocoa/browser_window_layout.h b/chrome/browser/ui/cocoa/browser_window_layout.h
|
| index e838586e1cac2ccf1a47108f0fa9cf0026ab6ec4..78c414b165070fe97c0dbd900a36cd55f9f22e51 100644
|
| --- a/chrome/browser/ui/cocoa/browser_window_layout.h
|
| +++ b/chrome/browser/ui/cocoa/browser_window_layout.h
|
| @@ -7,7 +7,7 @@
|
|
|
| #import <Cocoa/Cocoa.h>
|
|
|
| -#import "chrome/browser/ui/cocoa/fullscreen_toolbar_controller.h"
|
| +#import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_layout_manager.h"
|
|
|
| namespace chrome {
|
|
|
| @@ -25,13 +25,13 @@ struct LayoutParameters {
|
| // Whether the controller is in any fullscreen mode. This parameter should be
|
| // NO if the controller is in the process of entering fullscreen.
|
| BOOL inAnyFullscreen;
|
| - // The fullscreen sliding style. See fullscreen_toolbar_controller.h for more
|
| + // The fullscreen toolbar style. See fullscreen_toolbar_controller.h for more
|
| // details.
|
| - FullscreenSlidingStyle slidingStyle;
|
| + FullscreenToolbarStyle toolbarStyle;
|
| // The minY of the AppKit Menu Bar, relative to the top of the screen. Ranges
|
| // from 0 to -22. Only relevant in fullscreen mode.
|
| CGFloat menubarOffset;
|
| - // The fraction of the sliding toolbar that is visible in fullscreenm mode.
|
| + // The fraction of the fullscreen toolbar that is visible in fullscreen mode.
|
| // Ranges from 0 to 1. Only relevant in fullscreen mode.
|
| CGFloat toolbarFraction;
|
|
|
| @@ -147,7 +147,7 @@ struct LayoutOutput {
|
| // Whether the controller is in any fullscreen mode. |inAnyFullscreen| should
|
| // be NO if the controller is in the process of entering fullscreen.
|
| - (void)setInAnyFullscreen:(BOOL)inAnyFullscreen;
|
| -- (void)setSlidingStyle:(FullscreenSlidingStyle)slidingStyle;
|
| +- (void)setFullscreenToolbarStyle:(FullscreenToolbarStyle)toolbarStyle;
|
| - (void)setFullscreenMenubarOffset:(CGFloat)menubarOffset;
|
| - (void)setFullscreenToolbarFraction:(CGFloat)toolbarFraction;
|
|
|
|
|