Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1283)

Unified Diff: chrome/browser/extensions/extension_service.cc

Issue 417843004: Remove (Set)IsBeingReloaded from ExtensionService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/extension_service.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index a4b586278f7f2a1480112c835b7056438d8d0475..8f935577a0c6cc2be684a36463aeb93417eb7ba4 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -637,15 +637,12 @@ void ExtensionService::ReloadExtensionImpl(
// If we're reloading a component extension, use the component extension
// loader's reloader.
if (component_loader_->Exists(extension_id)) {
- SetBeingReloaded(extension_id, true);
component_loader_->Reload(extension_id);
- SetBeingReloaded(extension_id, false);
return;
}
// Check the installed extensions to see if what we're reloading was already
// installed.
- SetBeingReloaded(extension_id, true);
scoped_ptr<ExtensionInfo> installed_extension(
extension_prefs_->GetInstalledExtensionInfo(extension_id));
if (installed_extension.get() &&
@@ -661,8 +658,6 @@ void ExtensionService::ReloadExtensionImpl(
unpacked_installer->set_be_noisy_on_failure(be_noisy);
unpacked_installer->Load(path);
}
- // When reloading is done, mark this extension as done reloading.
- SetBeingReloaded(extension_id, false);
#endif // defined(ENABLE_EXTENSIONS)
}
@@ -2094,19 +2089,6 @@ void ExtensionService::OnExtensionInstallPrefChanged() {
CheckManagementPolicy();
}
-bool ExtensionService::IsBeingReloaded(
- const std::string& extension_id) const {
- return ContainsKey(extensions_being_reloaded_, extension_id);
-}
-
-void ExtensionService::SetBeingReloaded(const std::string& extension_id,
- bool isBeingReloaded) {
- if (isBeingReloaded)
- extensions_being_reloaded_.insert(extension_id);
- else
- extensions_being_reloaded_.erase(extension_id);
-}
-
bool ExtensionService::ShouldEnableOnInstall(const Extension* extension) {
// Extensions installed by policy can't be disabled. So even if a previous
// installation disabled the extension, make sure it is now enabled.
« no previous file with comments | « chrome/browser/extensions/extension_service.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698