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

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

Issue 1308713002: [Mac] Enable MacViews bookmark bubble behind --enable-mac-views-dialogs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pulse
Patch Set: 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
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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 class LocationBarViewMac; 42 class LocationBarViewMac;
43 @class OverlayableContentsController; 43 @class OverlayableContentsController;
44 class PermissionBubbleCocoa; 44 class PermissionBubbleCocoa;
45 @class PresentationModeController; 45 @class PresentationModeController;
46 class StatusBubbleMac; 46 class StatusBubbleMac;
47 @class TabStripController; 47 @class TabStripController;
48 @class TabStripView; 48 @class TabStripView;
49 @class ToolbarController; 49 @class ToolbarController;
50 @class TranslateBubbleController; 50 @class TranslateBubbleController;
51 51
52 namespace bookmarks {
53 class BookmarkBubbleObserver;
54 }
55
52 namespace content { 56 namespace content {
53 class WebContents; 57 class WebContents;
54 } 58 }
55 59
56 namespace extensions { 60 namespace extensions {
57 class Command; 61 class Command;
58 } 62 }
59 63
60 @interface BrowserWindowController : 64 @interface BrowserWindowController :
61 TabWindowController<NSUserInterfaceValidations, 65 TabWindowController<NSUserInterfaceValidations,
(...skipping 23 matching lines...) Expand all
85 base::scoped_nsobject<BrowserWindowFullscreenTransition> 89 base::scoped_nsobject<BrowserWindowFullscreenTransition>
86 fullscreenTransition_; 90 fullscreenTransition_;
87 91
88 // Strong. StatusBubble is a special case of a strong reference that 92 // 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 93 // 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 94 // as an NSWindowController in that it wraps a window that must
91 // be shut down before our destructors are called. 95 // be shut down before our destructors are called.
92 StatusBubbleMac* statusBubble_; 96 StatusBubbleMac* statusBubble_;
93 97
94 BookmarkBubbleController* bookmarkBubbleController_; // Weak. 98 BookmarkBubbleController* bookmarkBubbleController_; // Weak.
99 // Used when showing a toolkit-views bookmark bubble.
100 scoped_ptr<bookmarks::BookmarkBubbleObserver> viewsBookmarkBubbleObserver_;
95 BOOL initializing_; // YES while we are currently in initWithBrowser: 101 BOOL initializing_; // YES while we are currently in initWithBrowser:
96 BOOL ownsBrowser_; // Only ever NO when testing 102 BOOL ownsBrowser_; // Only ever NO when testing
97 103
98 TranslateBubbleController* translateBubbleController_; // Weak. 104 TranslateBubbleController* translateBubbleController_; // Weak.
99 105
100 // The total amount by which we've grown the window up or down (to display a 106 // The total amount by which we've grown the window up or down (to display a
101 // bookmark bar and/or download shelf), respectively; reset to 0 when moved 107 // bookmark bar and/or download shelf), respectively; reset to 0 when moved
102 // away from the bottom/top or resized (or zoomed). 108 // away from the bottom/top or resized (or zoomed).
103 CGFloat windowTopGrowth_; 109 CGFloat windowTopGrowth_;
104 CGFloat windowBottomGrowth_; 110 CGFloat windowBottomGrowth_;
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
606 - (ExclusiveAccessBubbleWindowController*)exclusiveAccessBubbleWindowController; 612 - (ExclusiveAccessBubbleWindowController*)exclusiveAccessBubbleWindowController;
607 613
608 // Gets the rect, in window base coordinates, that the omnibox popup should be 614 // Gets the rect, in window base coordinates, that the omnibox popup should be
609 // positioned relative to. 615 // positioned relative to.
610 - (NSRect)omniboxPopupAnchorRect; 616 - (NSRect)omniboxPopupAnchorRect;
611 617
612 @end // @interface BrowserWindowController (TestingAPI) 618 @end // @interface BrowserWindowController (TestingAPI)
613 619
614 620
615 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_ 621 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698