Preserve order of extensions when they auto-update.
Also added tests for the ExtensionToolbarModel.
BUG=33401
TEST=ExtensionToolbarModelTest (new test).
Review URL: http://codereview.chromium.org/587002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38407 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/extensions_service.cc b/chrome/browser/extensions/extensions_service.cc
index 3834ed5..48dfc2f 100644
--- a/chrome/browser/extensions/extensions_service.cc
+++ b/chrome/browser/extensions/extensions_service.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
@@ -627,6 +627,13 @@
allow_privilege_increase || !Extension::IsPrivilegeIncrease(
old, extension);
+ // Extensions get upgraded if silent upgrades are allowed, otherwise
+ // they get disabled.
+ if (allow_silent_upgrade) {
+ old->set_being_upgraded(true);
+ extension->set_being_upgraded(true);
+ }
+
// To upgrade an extension in place, unload the old one and
// then load the new one.
UnloadExtension(old->id());
@@ -690,6 +697,8 @@
}
}
+ extension->set_being_upgraded(false);
+
UpdateActiveExtensionsInCrashReporter();
}
