Add command line option to use a tabbed bookmark manager.

Start with --enable-tabbed-bookmark-manager. This will show chrome://bookmarks in a tab instead of the old bookmark manager. However, to get the bookmark manager extension to show you need to use --load-extension=path_to_extension. The extension uses the chrome_url_override to show the extension instead of the bookmark manager.

BUG=4890
TEST=See description

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

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

1 files changed, 11 insertions, 1 deletions

diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 5b962e0..f559e3e 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -1289,7 +1289,12 @@ void Browser::ToggleExtensionShelf() {
 
 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 @@ void Browser::ShowPageMenu() {
   window_->ShowPageMenu();
 }
 
+void Browser::ShowBookmarkManagerTab() {
+  UserMetrics::RecordAction("ShowBookmarks", profile_);
+  ShowSingletonTab(GURL(chrome::kChromeUIBookmarksURL));
+}
+
 void Browser::ShowHistoryTab() {
   UserMetrics::RecordAction("ShowHistory", profile_);
   ShowSingletonTab(GURL(chrome::kChromeUIHistoryURL));