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

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

Issue 175025: Add a bare-bones extension shelf that displays extension items on OS X. (Closed)
Patch Set: Merge ToT, address more comments Created 11 years, 3 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 | « chrome/app/nibs/ExtensionShelf.xib ('k') | chrome/browser/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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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_COCOA_BROWSER_WINDOW_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_COCOA_BROWSER_WINDOW_CONTROLLER_H_
6 #define CHROME_BROWSER_COCOA_BROWSER_WINDOW_CONTROLLER_H_ 6 #define CHROME_BROWSER_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
11 // TabWindowController, a tab strip along the top. 11 // TabWindowController, a tab strip along the top.
12 12
13 #import <Cocoa/Cocoa.h> 13 #import <Cocoa/Cocoa.h>
14 14
15 #include "base/scoped_nsobject.h" 15 #include "base/scoped_nsobject.h"
16 #include "base/scoped_ptr.h" 16 #include "base/scoped_ptr.h"
17 #import "chrome/browser/cocoa/tab_window_controller.h" 17 #import "chrome/browser/cocoa/tab_window_controller.h"
18 #import "chrome/browser/cocoa/bookmark_bar_controller.h" 18 #import "chrome/browser/cocoa/bookmark_bar_controller.h"
19 #import "chrome/browser/cocoa/bookmark_bubble_controller.h" 19 #import "chrome/browser/cocoa/bookmark_bubble_controller.h"
20 #import "chrome/browser/cocoa/view_resizer.h" 20 #import "chrome/browser/cocoa/view_resizer.h"
21 #import "third_party/GTM/AppKit/GTMTheme.h" 21 #import "third_party/GTM/AppKit/GTMTheme.h"
22 22
23 class Browser; 23 class Browser;
24 class BrowserWindow; 24 class BrowserWindow;
25 class BrowserWindowCocoa; 25 class BrowserWindowCocoa;
26 class ConstrainedWindowMac; 26 class ConstrainedWindowMac;
27 @class DownloadShelfController; 27 @class DownloadShelfController;
28 @class ExtensionShelfController;
28 @class FindBarCocoaController; 29 @class FindBarCocoaController;
29 @class GTMWindowSheetController; 30 @class GTMWindowSheetController;
30 @class InfoBarContainerController; 31 @class InfoBarContainerController;
31 class LocationBar; 32 class LocationBar;
32 class StatusBubble; 33 class StatusBubble;
33 class TabContents; 34 class TabContents;
34 @class TabContentsController; 35 @class TabContentsController;
35 @class TabStripController; 36 @class TabStripController;
36 class TabStripModelObserverBridge; 37 class TabStripModelObserverBridge;
37 @class TabStripView; 38 @class TabStripView;
(...skipping 20 matching lines...) Expand all
58 scoped_nsobject<NSWindow> fullscreen_window_; 59 scoped_nsobject<NSWindow> fullscreen_window_;
59 scoped_ptr<TabStripModelObserverBridge> tabObserver_; 60 scoped_ptr<TabStripModelObserverBridge> tabObserver_;
60 scoped_ptr<BrowserWindowCocoa> windowShim_; 61 scoped_ptr<BrowserWindowCocoa> windowShim_;
61 scoped_nsobject<ToolbarController> toolbarController_; 62 scoped_nsobject<ToolbarController> toolbarController_;
62 scoped_nsobject<TitlebarController> titlebarController_; 63 scoped_nsobject<TitlebarController> titlebarController_;
63 scoped_nsobject<TabStripController> tabStripController_; 64 scoped_nsobject<TabStripController> tabStripController_;
64 scoped_nsobject<FindBarCocoaController> findBarCocoaController_; 65 scoped_nsobject<FindBarCocoaController> findBarCocoaController_;
65 scoped_nsobject<InfoBarContainerController> infoBarContainerController_; 66 scoped_nsobject<InfoBarContainerController> infoBarContainerController_;
66 scoped_ptr<StatusBubble> statusBubble_; 67 scoped_ptr<StatusBubble> statusBubble_;
67 scoped_nsobject<DownloadShelfController> downloadShelfController_; 68 scoped_nsobject<DownloadShelfController> downloadShelfController_;
69 scoped_nsobject<ExtensionShelfController> extensionShelfController_;
68 scoped_nsobject<BookmarkBubbleController> bookmarkBubbleController_; 70 scoped_nsobject<BookmarkBubbleController> bookmarkBubbleController_;
69 scoped_nsobject<GTMTheme> theme_; 71 scoped_nsobject<GTMTheme> theme_;
70 BOOL ownsBrowser_; // Only ever NO when testing 72 BOOL ownsBrowser_; // Only ever NO when testing
71 BOOL fullscreen_; 73 BOOL fullscreen_;
74 CGFloat verticalOffsetForStatusBubble_;
72 } 75 }
73 76
74 // Load the browser window nib and do any Cocoa-specific initialization. 77 // Load the browser window nib and do any Cocoa-specific initialization.
75 // Takes ownership of |browser|. 78 // Takes ownership of |browser|.
76 - (id)initWithBrowser:(Browser*)browser; 79 - (id)initWithBrowser:(Browser*)browser;
77 80
78 // Call to make the browser go away from other places in the cross-platform 81 // Call to make the browser go away from other places in the cross-platform
79 // code. 82 // code.
80 - (void)destroyBrowser; 83 - (void)destroyBrowser;
81 84
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 171
169 // Return an autoreleased NSWindow suitable for fullscreen use. 172 // Return an autoreleased NSWindow suitable for fullscreen use.
170 - (NSWindow*)fullscreenWindow; 173 - (NSWindow*)fullscreenWindow;
171 174
172 // Return a point suitable for the topLeft for a bookmark bubble. 175 // Return a point suitable for the topLeft for a bookmark bubble.
173 - (NSPoint)topLeftForBubble; 176 - (NSPoint)topLeftForBubble;
174 177
175 @end // BrowserWindowController(TestingAPI) 178 @end // BrowserWindowController(TestingAPI)
176 179
177 #endif // CHROME_BROWSER_COCOA_BROWSER_WINDOW_CONTROLLER_H_ 180 #endif // CHROME_BROWSER_COCOA_BROWSER_WINDOW_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/app/nibs/ExtensionShelf.xib ('k') | chrome/browser/cocoa/browser_window_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698