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

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

Issue 1276383004: Implemented fullscreen exit animation with AppKit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed extra include Created 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/browser_window_controller.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_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 13 matching lines...) Expand all
24 #import "chrome/browser/ui/cocoa/url_drop_target.h" 24 #import "chrome/browser/ui/cocoa/url_drop_target.h"
25 #import "chrome/browser/ui/cocoa/view_resizer.h" 25 #import "chrome/browser/ui/cocoa/view_resizer.h"
26 #include "components/translate/core/common/translate_errors.h" 26 #include "components/translate/core/common/translate_errors.h"
27 #include "ui/base/accelerators/accelerator_manager.h" 27 #include "ui/base/accelerators/accelerator_manager.h"
28 #include "ui/gfx/geometry/rect.h" 28 #include "ui/gfx/geometry/rect.h"
29 29
30 @class AvatarBaseController; 30 @class AvatarBaseController;
31 class Browser; 31 class Browser;
32 class BrowserWindow; 32 class BrowserWindow;
33 class BrowserWindowCocoa; 33 class BrowserWindowCocoa;
34 @class BrowserWindowEnterFullscreenTransition; 34 @class BrowserWindowFullscreenTransition;
35 @class DevToolsController; 35 @class DevToolsController;
36 @class DownloadShelfController; 36 @class DownloadShelfController;
37 class ExtensionKeybindingRegistryCocoa; 37 class ExtensionKeybindingRegistryCocoa;
38 @class FindBarCocoaController; 38 @class FindBarCocoaController;
39 @class FullscreenModeController; 39 @class FullscreenModeController;
40 @class FullscreenWindow; 40 @class FullscreenWindow;
41 @class InfoBarContainerController; 41 @class InfoBarContainerController;
42 class LocationBarViewMac; 42 class LocationBarViewMac;
43 @class OverlayableContentsController; 43 @class OverlayableContentsController;
44 class PermissionBubbleCocoa; 44 class PermissionBubbleCocoa;
(...skipping 30 matching lines...) Expand all
75 base::scoped_nsobject<FindBarCocoaController> findBarCocoaController_; 75 base::scoped_nsobject<FindBarCocoaController> findBarCocoaController_;
76 base::scoped_nsobject<InfoBarContainerController> infoBarContainerController_; 76 base::scoped_nsobject<InfoBarContainerController> infoBarContainerController_;
77 base::scoped_nsobject<DownloadShelfController> downloadShelfController_; 77 base::scoped_nsobject<DownloadShelfController> downloadShelfController_;
78 base::scoped_nsobject<BookmarkBarController> bookmarkBarController_; 78 base::scoped_nsobject<BookmarkBarController> bookmarkBarController_;
79 base::scoped_nsobject<DevToolsController> devToolsController_; 79 base::scoped_nsobject<DevToolsController> devToolsController_;
80 base::scoped_nsobject<OverlayableContentsController> 80 base::scoped_nsobject<OverlayableContentsController>
81 overlayableContentsController_; 81 overlayableContentsController_;
82 base::scoped_nsobject<PresentationModeController> presentationModeController_; 82 base::scoped_nsobject<PresentationModeController> presentationModeController_;
83 base::scoped_nsobject<ExclusiveAccessBubbleWindowController> 83 base::scoped_nsobject<ExclusiveAccessBubbleWindowController>
84 exclusiveAccessBubbleWindowController_; 84 exclusiveAccessBubbleWindowController_;
85 base::scoped_nsobject<BrowserWindowEnterFullscreenTransition> 85 base::scoped_nsobject<BrowserWindowFullscreenTransition>
86 enterFullscreenTransition_; 86 fullscreenTransition_;
87 87
88 // Strong. StatusBubble is a special case of a strong reference that 88 // Strong. StatusBubble is a special case of a strong reference that
89 // we don't wrap in a scoped_ptr because it is acting the same 89 // we don't wrap in a scoped_ptr because it is acting the same
90 // as an NSWindowController in that it wraps a window that must 90 // as an NSWindowController in that it wraps a window that must
91 // be shut down before our destructors are called. 91 // be shut down before our destructors are called.
92 StatusBubbleMac* statusBubble_; 92 StatusBubbleMac* statusBubble_;
93 93
94 BookmarkBubbleController* bookmarkBubbleController_; // Weak. 94 BookmarkBubbleController* bookmarkBubbleController_; // Weak.
95 BOOL initializing_; // YES while we are currently in initWithBrowser: 95 BOOL initializing_; // YES while we are currently in initWithBrowser:
96 BOOL ownsBrowser_; // Only ever NO when testing 96 BOOL ownsBrowser_; // Only ever NO when testing
(...skipping 28 matching lines...) Expand all
125 125
126 // The borderless window used in fullscreen mode when Cocoa's System 126 // The borderless window used in fullscreen mode when Cocoa's System
127 // Fullscreen API is not being used (or not available, before OS 10.7). 127 // Fullscreen API is not being used (or not available, before OS 10.7).
128 base::scoped_nsobject<NSWindow> fullscreenWindow_; 128 base::scoped_nsobject<NSWindow> fullscreenWindow_;
129 129
130 // True between |-windowWillEnterFullScreen:| and |-windowDidEnterFullScreen:| 130 // True between |-windowWillEnterFullScreen:| and |-windowDidEnterFullScreen:|
131 // to indicate that the window is in the process of transitioning into 131 // to indicate that the window is in the process of transitioning into
132 // AppKit fullscreen mode. 132 // AppKit fullscreen mode.
133 BOOL enteringAppKitFullscreen_; 133 BOOL enteringAppKitFullscreen_;
134 134
135 // True between |-windowWillExitFullScreen:| and |-windowDidExitFullScreen:|
136 // to indicate that the window is in the process of transitioning out of
137 // AppKit fullscreen mode.
138 BOOL exitingAppKitFullscreen_;
139
135 // True between |enterImmersiveFullscreen| and |-windowDidEnterFullScreen:| 140 // True between |enterImmersiveFullscreen| and |-windowDidEnterFullScreen:|
136 // to indicate that the window is in the process of transitioning into 141 // to indicate that the window is in the process of transitioning into
137 // AppKit fullscreen mode. 142 // AppKit fullscreen mode.
138 BOOL enteringImmersiveFullscreen_; 143 BOOL enteringImmersiveFullscreen_;
139 144
140 // True between |-setPresentationMode:url:bubbleType:| and 145 // True between |-setPresentationMode:url:bubbleType:| and
141 // |-windowDidEnterFullScreen:| to indicate that the window is in the process 146 // |-windowDidEnterFullScreen:| to indicate that the window is in the process
142 // of transitioning into fullscreen presentation mode. 147 // of transitioning into fullscreen presentation mode.
143 BOOL enteringPresentationMode_; 148 BOOL enteringPresentationMode_;
144 149
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 - (ExclusiveAccessBubbleWindowController*)exclusiveAccessBubbleWindowController; 606 - (ExclusiveAccessBubbleWindowController*)exclusiveAccessBubbleWindowController;
602 607
603 // Gets the rect, in window base coordinates, that the omnibox popup should be 608 // Gets the rect, in window base coordinates, that the omnibox popup should be
604 // positioned relative to. 609 // positioned relative to.
605 - (NSRect)omniboxPopupAnchorRect; 610 - (NSRect)omniboxPopupAnchorRect;
606 611
607 @end // @interface BrowserWindowController (TestingAPI) 612 @end // @interface BrowserWindowController (TestingAPI)
608 613
609 614
610 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_ 615 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/browser_window_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698