Mac bookmark work.

- The bookmark menu is populated dynamically with bookmarks, including
  subfolders --> submenus.  E.g. star something --> shows up in menu.
  Menu items are disabled but always present and current.
- Always Show Bookmarks" menu now live; reads from / writes to
  preference, and shows correct "toggle state".
- Bookmark bar on each tab, present if requested.  (Currently an empty box).
- Random stuff; e.g. bookmark prefs init moved to a x-plat location.

This CL does not contain Cole's views.

Bried english description of the nib file changes:
- add a new view for the bookmark bar in the tab; hook it up to the controller
- Many tag sets (e.g. View-->Always Show Bookmarks Bar now 40009)
- Remove dummy bookmark menu items

Review URL: http://codereview.chromium.org/46078

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11936 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 2 deletions

diff --git a/chrome/browser/cocoa/browser_window_cocoa.h b/chrome/browser/cocoa/browser_window_cocoa.h
index a74ed8f..9f314ab 100644
--- a/chrome/browser/cocoa/browser_window_cocoa.h
+++ b/chrome/browser/cocoa/browser_window_cocoa.h
@@ -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 StatusBubbleMac;
 
 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 @@ class BrowserWindowCocoa : public BrowserWindow {
   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_