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

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

Issue 273193006: Install Chrome OS apps to shared location (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: added uninstall Created 6 years, 7 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
Index: chrome/browser/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 037abdbbdbe63e221bd4e4d1888fafcbb310cb18..ec7ee1ab4c7625a048a2fa3e87ac12adaacbf3d0 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -22,6 +22,7 @@
#include "chrome/browser/extensions/component_loader.h"
#include "chrome/browser/extensions/crx_installer.h"
#include "chrome/browser/extensions/data_deleter.h"
+#include "chrome/browser/extensions/extension_assets_manager.h"
#include "chrome/browser/extensions/extension_disabled_ui.h"
#include "chrome/browser/extensions/extension_error_controller.h"
#include "chrome/browser/extensions/extension_install_ui.h"
@@ -725,9 +726,11 @@ bool ExtensionService::UninstallExtension(const std::string& extension_id,
if (!Manifest::IsUnpackedLocation(extension->location())) {
if (!GetFileTaskRunner()->PostTask(
FROM_HERE,
- base::Bind(&extensions::file_util::UninstallExtension,
+ base::Bind(&ExtensionService::UninstallExtensionOnFileThread,
+ extension_id,
+ profile_,
install_directory_,
- extension_id)))
+ extension->path())))
NOTREACHED();
}
@@ -760,6 +763,17 @@ bool ExtensionService::UninstallExtension(const std::string& extension_id,
return true;
}
+// static
+void ExtensionService::UninstallExtensionOnFileThread(
+ const std::string& id,
+ Profile* profile,
+ const base::FilePath& install_dir,
+ const base::FilePath& extension_path) {
+ extensions::ExtensionAssetsManager* assets_manager =
+ extensions::ExtensionAssetsManager::GetInstance();
+ assets_manager->UninstallExtension(id, profile, install_dir, extension_path);
+}
+
bool ExtensionService::IsExtensionEnabled(
const std::string& extension_id) const {
if (registry_->enabled_extensions().Contains(extension_id) ||

Powered by Google App Engine
This is Rietveld 408576698