Reworked ExtensionsService::AddPendingExtension().

chrome/browser/extensions/extension_prefs.cc

 // Copyright (c) 2010 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 "base/string_util.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 
 using base::Time;
@@ skipping 426 matching lines @@
     const std::vector<std::string>& extension_ids) {
   ListValue* toolbar_order = prefs_->GetMutableList(kExtensionToolbar);
   toolbar_order->Clear();
   for (std::vector<std::string>::const_iterator iter = extension_ids.begin();
        iter != extension_ids.end(); ++iter) {
     toolbar_order->Append(new StringValue(*iter));
   }
   prefs_->ScheduleSavePersistentPrefs();
 }
 
-void ExtensionPrefs::OnExtensionInstalled(Extension* extension) {
+void ExtensionPrefs::OnExtensionInstalled(
+    Extension* extension, Extension::State initial_state,
+    bool initial_incognito_enabled) {
   const std::string& id = extension->id();
-  // Make sure we don't enable a disabled extension.
-  if (GetExtensionState(extension->id()) != Extension::DISABLED) {
-    UpdateExtensionPref(id, kPrefState,
-                        Value::CreateIntegerValue(Extension::ENABLED));
-  }
+  UpdateExtensionPref(id, kPrefState,
+                      Value::CreateIntegerValue(initial_state));
+  UpdateExtensionPref(id, kPrefIncognitoEnabled,
+                      Value::CreateBooleanValue(initial_incognito_enabled));
   UpdateExtensionPref(id, kPrefLocation,
                       Value::CreateIntegerValue(extension->location()));
   FilePath::StringType path = MakePathRelative(install_directory_,
       extension->path(), NULL);
   UpdateExtensionPref(id, kPrefPath, Value::CreateStringValue(path));
   // We store prefs about LOAD extensions, but don't cache their manifest
   // since it may change on disk.
   if (extension->location() != Extension::LOAD) {
     UpdateExtensionPref(id, kPrefManifest,
                         extension->manifest_value()->DeepCopy());
@@ skipping 343 matching lines @@
 
 
 // static
 void ExtensionPrefs::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(kExtensionsPref);
   prefs->RegisterListPref(kExtensionShelf);
   prefs->RegisterListPref(kExtensionToolbar);
   prefs->RegisterIntegerPref(prefs::kExtensionToolbarSize, -1);
   prefs->RegisterDictionaryPref(kExtensionsBlacklistUpdate);
 }