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, 2 insertions, 6 deletions

diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc
index a747c31..570763f 100644
--- a/chrome/browser/browser_prefs.cc
+++ b/chrome/browser/browser_prefs.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/browser_prefs.h"
 
 #include "chrome/browser/autofill_manager.h"
+#include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/cache_manager_host.h"
@@ -23,9 +24,7 @@
 
 #if defined(OS_WIN)  // TODO(port): whittle this down as we port
 #include "chrome/browser/task_manager.h"
-#include "chrome/browser/views/bookmark_bar_view.h"
 #include "chrome/browser/views/bookmark_manager_view.h"
-#include "chrome/browser/views/bookmark_table_view.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/keyword_editor_view.h"
 #include "chrome/browser/views/page_info_window.h"
@@ -58,10 +57,7 @@ void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) {
   chrome_browser_net::RegisterUserPrefs(user_prefs);
   DownloadManager::RegisterUserPrefs(user_prefs);
   SSLManager::RegisterUserPrefs(user_prefs);
-#if defined(OS_WIN)  // TODO(port): whittle this down as we port
-  BookmarkBarView::RegisterUserPrefs(user_prefs);
-  BookmarkTableView::RegisterUserPrefs(user_prefs);
-#endif
+  bookmark_utils::RegisterUserPrefs(user_prefs);
   AutofillManager::RegisterUserPrefs(user_prefs);
   TabContents::RegisterUserPrefs(user_prefs);
   TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs);