Add command line option to use a tabbed bookmark manager

chrome/common/extensions/extension.cc

Index: chrome/common/extensions/extension.cc
===================================================================
--- chrome/common/extensions/extension.cc	(revision 40140)
+++ chrome/common/extensions/extension.cc	(working copy)
@@ -64,7 +64,11 @@
     if (str == Extension::kPermissionNames[i]) {
       if (str == Extension::kExperimentalPermission &&
           !CommandLine::ForCurrentProcess()->HasSwitch(
-              switches::kEnableExperimentalExtensionApis)) {
+              switches::kEnableExperimentalExtensionApis) &&
+          // TODO(arv): Tighten this so that not all extensions can access the
+          // experimental APIs.
+          !CommandLine::ForCurrentProcess()->HasSwitch(
+              switches::kEnableTabbedBookmarkManager)) {
         return false;
       }
       return true;
@@ -1282,7 +1286,8 @@
       // this check, but let's keep it simple for now.
       // TODO(erikkay) enable other pages as well
       std::string val;
-      if ((page != chrome::kChromeUINewTabHost) ||
+      if ((page != chrome::kChromeUINewTabHost &&
+           page != chrome::kChromeUIBookmarksHost) ||
           !overrides->GetStringWithoutPathExpansion(*iter, &val)) {
         *error = errors::kInvalidChromeURLOverrides;
         return false;