Chromium Code Reviews Chromium Code Reviews
Issue 7890056:
FullscreenExitBubble temp UI for Mac. (Closed)
Base URL: http://git.chromium.org/git/chromium.git@trunk| Index: chrome/browser/ui/cocoa/browser_window_controller.h |
| diff --git a/chrome/browser/ui/cocoa/browser_window_controller.h b/chrome/browser/ui/cocoa/browser_window_controller.h |
| index 897dad04313f68dd1a875383f85fabfb47d1a715..f1f62ac1fd46d926332e7cc97afb2ce0c18c63e3 100644 |
| --- a/chrome/browser/ui/cocoa/browser_window_controller.h |
| +++ b/chrome/browser/ui/cocoa/browser_window_controller.h |
| @@ -19,6 +19,7 @@ |
| #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" |
| #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h" |
| #import "chrome/browser/ui/cocoa/browser_command_executor.h" |
| +#import "chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h" |
| #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h" |
| #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h" |
| #import "chrome/browser/ui/cocoa/tabs/tab_window_controller.h" |
| @@ -73,6 +74,8 @@ class TabContents; |
| scoped_nsobject<SidebarController> sidebarController_; |
| scoped_nsobject<PreviewableContentsController> previewableContentsController_; |
| scoped_nsobject<PresentationModeController> presentationModeController_; |
| + scoped_nsobject<FullscreenExitBubbleController> |
| + fullscreenExitBubbleController_; |
| // Strong. StatusBubble is a special case of a strong reference that |
| // we don't wrap in a scoped_ptr because it is acting the same |
| @@ -121,6 +124,10 @@ class TabContents; |
| // nil for those which don't). |
| scoped_nsobject<NSView> floatingBarBackingView_; |
| + // Tracks whether to show the chrome that drops down from the top of the |
| + // screen in fullscreen mode. |
| + BOOL showFloatingChrome_; |
|
Nico
2011/09/15 20:09:14
Put "fullscreen" somewhere in that name. showTabOv
jeremya
2011/09/16 03:39:58
It's no longer used, in favour of just forcibly hi
|
| + |
| // Tracks whether the floating bar is above or below the bookmark bar, in |
| // terms of z-order. |
| BOOL floatingBarAboveBookmarkBar_; |
| @@ -243,6 +250,9 @@ class TabContents; |
| // Lazily creates the download shelf in visible state if it doesn't exist yet. |
| - (DownloadShelfController*)downloadShelf; |
| +// The maximum Y position for subviews inside the content view. |
| +- (CGFloat)maxYForViewInsideContent; |
|
Nico
2011/09/15 20:09:14
can be private, right?
jeremya
2011/09/16 03:39:58
In fact, I don't need this method at all.
|
| + |
| // Retains the given FindBarCocoaController and adds its view to this |
| // browser window. Must only be called once per |
| // BrowserWindowController. |
| @@ -392,6 +402,10 @@ class TabContents; |
| - (CGFloat)floatingBarShownFraction; |
| - (void)setFloatingBarShownFraction:(CGFloat)fraction; |
| +// Sets whether to show the chrome that drops down from the top of the |
| +// screen in fullscreen mode. |
| +- (void)setShowFloatingChrome:(BOOL)showChrome; |
| + |
| // Query/lock/release the requirement that the tab strip/toolbar/attached |
| // bookmark bar bar cluster is visible (e.g., when one of its elements has |
| // focus). This is required for the floating bar in presentation mode, but |
