Add command line option to use a tabbed bookmark manager

chrome/browser/browser.cc

Index: chrome/browser/browser.cc
===================================================================
--- chrome/browser/browser.cc	(revision 40140)
+++ chrome/browser/browser.cc	(working copy)
@@ -1289,7 +1289,12 @@
 
 void Browser::OpenBookmarkManager() {
   UserMetrics::RecordAction("ShowBookmarkManager", profile_);
-  window_->ShowBookmarkManager();
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableTabbedBookmarkManager)) {
+    ShowBookmarkManagerTab();
+  } else {
+    window_->ShowBookmarkManager();
+  }
 }
 
 void Browser::ShowAppMenu() {
@@ -1302,6 +1307,11 @@
   window_->ShowPageMenu();
 }
 
+void Browser::ShowBookmarkManagerTab() {
+  UserMetrics::RecordAction("ShowBookmarks", profile_);
+  ShowSingletonTab(GURL(chrome::kChromeUIBookmarksURL));
+}
+
 void Browser::ShowHistoryTab() {
   UserMetrics::RecordAction("ShowHistory", profile_);
   ShowSingletonTab(GURL(chrome::kChromeUIHistoryURL));