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

diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 39929f7..0130929 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -64,7 +64,11 @@ static bool IsAPIPermission(const std::string& str) {
     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;
@@ -1284,7 +1288,8 @@ bool Extension::InitFromValue(const DictionaryValue& source, bool require_id,
       // 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;