Re-enable the --enable-extensions flag. Fix a bunch of bugs

chrome/browser/extensions/extensions_service.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/browser/extensions/extensions_service.h"
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/crypto/signature_verifier.h"
 #include "base/file_util.h"
@@ skipping 193 matching lines @@
 
   // The ID we expect this extension to have, if any.
   std::string expected_id_;
 
   // True if we got a response from the utility process and have cleaned up
   // already.
   bool got_response_;
 };
 
 ExtensionsService::ExtensionsService(Profile* profile,
+                                     const CommandLine* command_line,
                                      MessageLoop* frontend_loop,
                                      MessageLoop* backend_loop)
     : extension_prefs_(new ExtensionPrefs(profile->GetPrefs())),
       backend_loop_(backend_loop),
       install_directory_(profile->GetPath().AppendASCII(kInstallDirectoryName)),
       extensions_enabled_(false),
       show_extensions_prompts_(true),
       ready_(false) {
+  // Figure out if extension installation should be enabled.
+  if (command_line->HasSwitch(switches::kEnableExtensions))
+    extensions_enabled_ = true;
+  else if (profile->GetPrefs()->GetBoolean(prefs::kEnableExtensions))
+    extensions_enabled_ = true;
+
   // We pass ownership of this object to the Backend.
   DictionaryValue* extensions = extension_prefs_->CopyCurrentExtensions();
   backend_ = new ExtensionsServiceBackend(
           install_directory_, g_browser_process->resource_dispatcher_host(),
           frontend_loop, extensions, extensions_enabled());
 }
 
 ExtensionsService::~ExtensionsService() {
   UnloadAllExtensions();
 }
@@ skipping 224 matching lines @@
 
 ExtensionsServiceBackend::ExtensionsServiceBackend(
     const FilePath& install_directory, ResourceDispatcherHost* rdh,
     MessageLoop* frontend_loop, DictionaryValue* extension_prefs,
     bool extensions_enabled)
         : frontend_(NULL),
           install_directory_(install_directory),
           resource_dispatcher_host_(rdh),
           alert_on_error_(false),
           frontend_loop_(frontend_loop),
-          extensions_enabled_(false) {
+          extensions_enabled_(extensions_enabled) {
   external_extension_providers_[Extension::EXTERNAL_PREF] =
       linked_ptr<ExternalExtensionProvider>(
           new ExternalPrefExtensionProvider(extension_prefs));
 #if defined(OS_WIN)
   external_extension_providers_[Extension::EXTERNAL_REGISTRY] =
       linked_ptr<ExternalExtensionProvider>(
           new ExternalRegistryExtensionProvider());
 #endif
 }
 
@@ skipping 488 matching lines @@
 
   Extension::Location location = Extension::INTERNAL;
   LookupExternalExtension(extension.id(), NULL, &location);
 
   // We currently only allow themes and registry-installed extensions to be
   // installed.
   if (!extensions_enabled_ &&
       !extension.IsTheme() &&
       location != Extension::EXTERNAL_REGISTRY) {
     ReportExtensionInstallError(extension_path,
-                                "Extensions are not enabled (yet!)");
+        "Extensions are not enabled. Add --enable-extensions to the "
+        "command-line to enable extensions.\n\n"
+        "This is a temporary message and it will be removed when extensions "
+        "UI is finalized.");
     return;
   }
 
 #if defined(OS_WIN)
+  // We don't show the install dialog for themes or external extensions.
   if (!extension.IsTheme() &&
       !Extension::IsExternalLocation(location) &&
       frontend_->show_extensions_prompts() &&
       win_util::MessageBox(GetForegroundWindow(),
           L"Are you sure you want to install this extension?\n\n"
           L"This is a temporary message and it will be removed when extensions "
           L"UI is finalized.",
           l10n_util::GetString(IDS_PRODUCT_NAME).c_str(),
           MB_OKCANCEL) != IDOK) {
     ReportExtensionInstallError(extension_path,
@@ skipping 284 matching lines @@
   Extension::InstallType install_type =
       CompareToInstalledVersion(id, version->GetString(), &current_version);
 
   if (install_type == Extension::DOWNGRADE)
     return false;
 
   return (install_type == Extension::UPGRADE ||
           install_type == Extension::NEW_INSTALL ||
           NeedsReinstall(id, current_version));
 }