Add command line option to use a tabbed bookmark manager

chrome/browser/browser.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/browser.h"
 
 #include <algorithm>
 #include <string>
 
 #include "app/animation.h"
@@ skipping 1271 matching lines @@
   window_->ToggleBookmarkBar();
 }
 
 void Browser::ToggleExtensionShelf() {
   UserMetrics::RecordAction("ToggleExtensionShelf", profile_);
   window_->ToggleExtensionShelf();
 }
 
 void Browser::OpenBookmarkManager() {
   UserMetrics::RecordAction("ShowBookmarkManager", profile_);
-  window_->ShowBookmarkManager();
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableTabbedBookmarkManager)) {
+    ShowBookmarkManagerTab();
+  } else {
+    window_->ShowBookmarkManager();
+  }
 }
 
 void Browser::ShowAppMenu() {
   UserMetrics::RecordAction("ShowAppMenu", profile_);
   window_->ShowAppMenu();
 }
 
 void Browser::ShowPageMenu() {
   UserMetrics::RecordAction("ShowPageMenu", profile_);
   window_->ShowPageMenu();
 }
 
+void Browser::ShowBookmarkManagerTab() {
+  UserMetrics::RecordAction("ShowBookmarks", profile_);
+  ShowSingletonTab(GURL(chrome::kChromeUIBookmarksURL));
+}
+
 void Browser::ShowHistoryTab() {
   UserMetrics::RecordAction("ShowHistory", profile_);
   ShowSingletonTab(GURL(chrome::kChromeUIHistoryURL));
 }
 
 void Browser::ShowDownloadsTab() {
   UserMetrics::RecordAction("ShowDownloads", profile_);
   ShowSingletonTab(GURL(chrome::kChromeUIDownloadsURL));
 }
 
@@ skipping 1993 matching lines @@
     return;
 
   ExtensionsService* extension_service = profile()->GetExtensionsService();
   if (extension_service && extension_service->is_ready()) {
     Extension* extension =
         extension_service->GetExtensionById(app_extension_id, false);
     if (extension)
       contents->SetAppExtension(extension);
   }
 }