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

Unified Diff: chrome/browser/cocoa/browser_window_cocoa.h

Issue 46078: Mac bookmark work. ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/cocoa/browser_test_helper.h ('k') | chrome/browser/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/cocoa/browser_window_cocoa.h
===================================================================
--- chrome/browser/cocoa/browser_window_cocoa.h (revision 11933)
+++ chrome/browser/cocoa/browser_window_cocoa.h (working copy)
@@ -7,9 +7,13 @@
#include "base/scoped_ptr.h"
#include "chrome/browser/browser_window.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/cocoa/bookmark_menu_bridge.h"
+class Browser;
@class BrowserWindowController;
@class NSWindow;
+@class NSMenu;
class StatusBubbleMac;
@@ -19,7 +23,9 @@
class BrowserWindowCocoa : public BrowserWindow {
public:
- BrowserWindowCocoa(BrowserWindowController* controller, NSWindow* window);
+ BrowserWindowCocoa(Browser* browser,
+ BrowserWindowController* controller,
+ NSWindow* window);
virtual ~BrowserWindowCocoa();
// Overridden from BrowserWindow
@@ -63,15 +69,17 @@
virtual void ShowNewProfileDialog();
virtual void ShowHTMLDialog(HtmlDialogContentsDelegate* delegate,
void* parent_window);
+
protected:
virtual void DestroyBrowser();
private:
+ Browser* browser_;
BrowserWindowController* controller_; // weak, owns us
NSWindow* window_; // weak, owned by |controller_|
-
// The status bubble manager. Always non-NULL.
scoped_ptr<StatusBubbleMac> status_bubble_;
+ BookmarkMenuBridge bookmark_menu_bridge_;
};
#endif // CHROME_BROWSER_COCOA_BROWSER_WINDOW_COCOA_H_
« no previous file with comments | « chrome/browser/cocoa/browser_test_helper.h ('k') | chrome/browser/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698