Add command line option to use a tabbed bookmark manager

chrome/common/extensions/extension.cc

 // Copyright (c) 2009 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/common/extensions/extension.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 46 matching lines @@
   for (size_t i = 0; i < id->size(); ++i)
     (*id)[i] = HexStringToInt(id->substr(i, 1)) + 'a';
 }
 
 // Returns true if the given string is an API permission (see kPermissionNames).
 static bool IsAPIPermission(const std::string& str) {
   for (size_t i = 0; i < Extension::kNumPermissions; ++i) {
     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;
     }
   }
   return false;
 }
 
 }  // namespace
 
@@ skipping 1197 matching lines @@
     }
 
     // Validate that the overrides are all strings
     for (DictionaryValue::key_iterator iter = overrides->begin_keys();
          iter != overrides->end_keys(); ++iter) {
       std::string page = WideToUTF8(*iter);
       // For now, only allow the new tab page.  Others will work when we remove
       // 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;
       }
       // Replace the entry with a fully qualified chrome-extension:// URL.
       chrome_url_overrides_[page] = GetResourceURL(val);
     }
   }
 
   // If it's an app, load the appropriate keys, etc.
@@ skipping 137 matching lines @@
     UserScript::PatternList::const_iterator pattern =
         content_script->url_patterns().begin();
     for (; pattern != content_script->url_patterns().end(); ++pattern) {
       if (pattern->match_subdomains() && pattern->host().empty())
         return true;
     }
   }
 
   return false;
 }