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

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

Issue 848153005: Revert of mac: Implement custom AppKit Enter Fullscreen transition. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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) 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 14 matching lines...) Expand all
25 #import "chrome/browser/ui/cocoa/url_drop_target.h" 25 #import "chrome/browser/ui/cocoa/url_drop_target.h"
26 #import "chrome/browser/ui/cocoa/view_resizer.h" 26 #import "chrome/browser/ui/cocoa/view_resizer.h"
27 #include "components/translate/core/common/translate_errors.h" 27 #include "components/translate/core/common/translate_errors.h"
28 #include "ui/base/accelerators/accelerator_manager.h" 28 #include "ui/base/accelerators/accelerator_manager.h"
29 #include "ui/gfx/geometry/rect.h" 29 #include "ui/gfx/geometry/rect.h"
30 30
31 @class AvatarBaseController; 31 @class AvatarBaseController;
32 class Browser; 32 class Browser;
33 class BrowserWindow; 33 class BrowserWindow;
34 class BrowserWindowCocoa; 34 class BrowserWindowCocoa;
35 @class BrowserWindowEnterFullscreenTransition;
36 @class DevToolsController; 35 @class DevToolsController;
37 @class DownloadShelfController; 36 @class DownloadShelfController;
38 class ExtensionKeybindingRegistryCocoa; 37 class ExtensionKeybindingRegistryCocoa;
39 @class FindBarCocoaController; 38 @class FindBarCocoaController;
40 @class FullscreenModeController; 39 @class FullscreenModeController;
41 @class FullscreenWindow; 40 @class FullscreenWindow;
42 @class InfoBarContainerController; 41 @class InfoBarContainerController;
43 class LocationBarViewMac; 42 class LocationBarViewMac;
44 @class OverlayableContentsController; 43 @class OverlayableContentsController;
45 class PermissionBubbleCocoa; 44 class PermissionBubbleCocoa;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 base::scoped_nsobject<FindBarCocoaController> findBarCocoaController_; 76 base::scoped_nsobject<FindBarCocoaController> findBarCocoaController_;
78 base::scoped_nsobject<InfoBarContainerController> infoBarContainerController_; 77 base::scoped_nsobject<InfoBarContainerController> infoBarContainerController_;
79 base::scoped_nsobject<DownloadShelfController> downloadShelfController_; 78 base::scoped_nsobject<DownloadShelfController> downloadShelfController_;
80 base::scoped_nsobject<BookmarkBarController> bookmarkBarController_; 79 base::scoped_nsobject<BookmarkBarController> bookmarkBarController_;
81 base::scoped_nsobject<DevToolsController> devToolsController_; 80 base::scoped_nsobject<DevToolsController> devToolsController_;
82 base::scoped_nsobject<OverlayableContentsController> 81 base::scoped_nsobject<OverlayableContentsController>
83 overlayableContentsController_; 82 overlayableContentsController_;
84 base::scoped_nsobject<PresentationModeController> presentationModeController_; 83 base::scoped_nsobject<PresentationModeController> presentationModeController_;
85 base::scoped_nsobject<ExclusiveAccessBubbleWindowController> 84 base::scoped_nsobject<ExclusiveAccessBubbleWindowController>
86 exclusiveAccessBubbleWindowController_; 85 exclusiveAccessBubbleWindowController_;
87 base::scoped_nsobject<BrowserWindowEnterFullscreenTransition>
88 enterFullscreenTransition_;
89 86
90 // Strong. StatusBubble is a special case of a strong reference that 87 // Strong. StatusBubble is a special case of a strong reference that
91 // we don't wrap in a scoped_ptr because it is acting the same 88 // we don't wrap in a scoped_ptr because it is acting the same
92 // as an NSWindowController in that it wraps a window that must 89 // as an NSWindowController in that it wraps a window that must
93 // be shut down before our destructors are called. 90 // be shut down before our destructors are called.
94 StatusBubbleMac* statusBubble_; 91 StatusBubbleMac* statusBubble_;
95 92
96 BookmarkBubbleController* bookmarkBubbleController_; // Weak. 93 BookmarkBubbleController* bookmarkBubbleController_; // Weak.
97 BOOL initializing_; // YES while we are currently in initWithBrowser: 94 BOOL initializing_; // YES while we are currently in initWithBrowser:
98 BOOL ownsBrowser_; // Only ever NO when testing 95 BOOL ownsBrowser_; // Only ever NO when testing
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 // positioned relative to. 608 // positioned relative to.
612 - (NSRect)omniboxPopupAnchorRect; 609 - (NSRect)omniboxPopupAnchorRect;
613 610
614 // Force a layout of info bars. 611 // Force a layout of info bars.
615 - (void)layoutInfoBars; 612 - (void)layoutInfoBars;
616 613
617 @end // @interface BrowserWindowController (TestingAPI) 614 @end // @interface BrowserWindowController (TestingAPI)
618 615
619 616
620 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_ 617 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_
OLDNEW
« no previous file with comments | « base/mac/sdk_forward_declarations.h ('k') | chrome/browser/ui/cocoa/browser_window_controller_private.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698