disable extension toolstrips by default, adding

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/resource_bundle.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 900 matching lines @@
   // Initialize options page url (optional).
   if (source.HasKey(keys::kOptionsPage)) {
     std::string options_str;
     if (!source.GetString(keys::kOptionsPage, &options_str)) {
       *error = errors::kInvalidOptionsPage;
       return false;
     }
     options_url_ = GetResourceURL(options_str);
   }
 
-  // Initialize toolstrips (optional).
-  if (source.HasKey(keys::kToolstrips)) {
+  // Initialize toolstrips (deprecated and optional).
+  // TODO(erikkay) remove this altogether.
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableExtensionToolstrips) &&
+      source.HasKey(keys::kToolstrips)) {
     ListValue* list_value;
     if (!source.GetList(keys::kToolstrips, &list_value)) {
       *error = errors::kInvalidToolstrips;
       return false;
     }
 
     for (size_t i = 0; i < list_value->GetSize(); ++i) {
       ToolstripInfo toolstrip;
       DictionaryValue* toolstrip_value;
       std::string toolstrip_path;
       if (list_value->GetString(i, &toolstrip_path)) {
         // Support a simple URL value for backwards compatibility.
-        // TODO(erikkay) Perhaps deprecate this in the future.
         toolstrip.toolstrip = GetResourceURL(toolstrip_path);
       } else if (list_value->GetDictionary(i, &toolstrip_value)) {
         if (!toolstrip_value->GetString(keys::kToolstripPath,
                                         &toolstrip_path)) {
           *error = ExtensionErrorUtils::FormatErrorMessage(
               errors::kInvalidToolstrip, IntToString(i));
           return false;
         }
         toolstrip.toolstrip = GetResourceURL(toolstrip_path);
         if (toolstrip_value->HasKey(keys::kToolstripMolePath)) {
           std::string mole_path;
           if (!toolstrip_value->GetString(keys::kToolstripMolePath,
                                           &mole_path)) {
             *error = ExtensionErrorUtils::FormatErrorMessage(
                 errors::kInvalidToolstrip, IntToString(i));
             return false;
           }
-          // TODO(erikkay) is there a better way to get this dynamically
-          // from the content itself?
           int height;
           if (!toolstrip_value->GetInteger(keys::kToolstripMoleHeight,
                                            &height) || (height < 0)) {
             *error = ExtensionErrorUtils::FormatErrorMessage(
                 errors::kInvalidToolstrip, IntToString(i));
             return false;
           }
           toolstrip.mole = GetResourceURL(mole_path);
           toolstrip.mole_height = height;
         }
@@ skipping 285 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;
 }